ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [1/2] incubator-ignite git commit: # IGNITE-312 Rename TcpDiscoveryCustomMessage -> TcpDiscoveryCustomEventMessage
Date Tue, 24 Feb 2015 16:26:21 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-312 e6a6bad55 -> 2016742e6


# IGNITE-312 Rename TcpDiscoveryCustomMessage -> TcpDiscoveryCustomEventMessage


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6daa05bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6daa05bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6daa05bb

Branch: refs/heads/ignite-312
Commit: 6daa05bbcbc9a5454574850c29ddb0b7251e8991
Parents: e6a6bad
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Tue Feb 24 19:20:45 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Tue Feb 24 19:20:45 2015 +0300

----------------------------------------------------------------------
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  8 +--
 .../TcpDiscoveryCustomEventMessage.java         | 66 ++++++++++++++++++++
 .../tcp/messages/TcpDiscoveryCustomMessage.java | 66 --------------------
 3 files changed, 70 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6daa05bb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 3da9413..5920970 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1248,7 +1248,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
 
     /** {@inheritDoc} */
     @Override public void sendCustomEvent(Object evt) {
-        msgWorker.addMessage(new TcpDiscoveryCustomMessage(getLocalNodeId(), evt));
+        msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt));
     }
 
     /**
@@ -2557,8 +2557,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
             else if (msg instanceof TcpDiscoveryDiscardMessage)
                 processDiscardMessage((TcpDiscoveryDiscardMessage)msg);
 
-            else if (msg instanceof TcpDiscoveryCustomMessage)
-                processCustomMessage((TcpDiscoveryCustomMessage)msg);
+            else if (msg instanceof TcpDiscoveryCustomEventMessage)
+                processCustomMessage((TcpDiscoveryCustomEventMessage)msg);
 
             else
                 assert false : "Unknown message type: " + msg.getClass().getSimpleName();
@@ -4384,7 +4384,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
         /**
          * @param msg Message.
          */
-        private void processCustomMessage(TcpDiscoveryCustomMessage msg) {
+        private void processCustomMessage(TcpDiscoveryCustomEventMessage msg) {
             if (msg.creatorNodeId().equals(getLocalNodeId())) {
                 if (msg.senderNodeId() != null)
                     return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6daa05bb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
new file mode 100644
index 0000000..6b5f9bc
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.discovery.tcp.messages;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Wrapped for custom message.
+ */
+public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage {
+    /** */
+    private Object msg;
+
+    /**
+     * Public default no-arg constructor for {@link Externalizable} interface.
+     */
+    public TcpDiscoveryCustomEventMessage() {
+        // No-op.
+    }
+
+    /**
+     * @param creatorNodeId Creator node id.
+     */
+    public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, Object msg) {
+        super(creatorNodeId);
+
+        this.msg = msg;
+    }
+
+    /**
+     * @return Message.
+     */
+    public Object message() {
+        return msg;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+
+        out.writeObject(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
+        super.readExternal(in);
+
+        msg = in.readObject();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6daa05bb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomMessage.java
deleted file mode 100644
index 2f0e1c4..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.tcp.messages;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Wrapped for custom message.
- */
-public class TcpDiscoveryCustomMessage extends TcpDiscoveryAbstractMessage {
-    /** */
-    private Object msg;
-
-    /**
-     * Public default no-arg constructor for {@link Externalizable} interface.
-     */
-    public TcpDiscoveryCustomMessage() {
-        // No-op.
-    }
-
-    /**
-     * @param creatorNodeId Creator node id.
-     */
-    public TcpDiscoveryCustomMessage(UUID creatorNodeId, Object msg) {
-        super(creatorNodeId);
-
-        this.msg = msg;
-    }
-
-    /**
-     * @return Message.
-     */
-    public Object message() {
-        return msg;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        super.writeExternal(out);
-
-        out.writeObject(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
-        super.readExternal(in);
-
-        msg = in.readObject();
-    }
-}


Mime
View raw message