ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [4/4] incubator-ignite git commit: # IGNITE-709 Remove bad field TcpDiscoveryAbstractMessage.destClientNodeId
Date Mon, 18 May 2015 09:26:03 GMT
# IGNITE-709 Remove bad field TcpDiscoveryAbstractMessage.destClientNodeId


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

Branch: refs/heads/ignite-709_2
Commit: ed76bf0c5af3088eb4a8a7d32163a8a307461b07
Parents: 43e870e
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Mon May 18 12:25:02 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Mon May 18 12:25:02 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 18 ------------------
 .../tcp/messages/TcpDiscoveryAbstractMessage.java | 17 -----------------
 2 files changed, 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed76bf0c/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 571af20..3252b8c 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
@@ -4899,24 +4899,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
                     try {
                         TcpDiscoveryAbstractMessage msg = marsh.unmarshal(in, U.gridClassLoader());
 
-                        UUID destClientNodeId = msg.destinationClientNodeId();
-
-                        if (destClientNodeId != null) {
-                            ClientMessageWorker wrk = clientMsgWorkers.get(destClientNodeId);
-
-                            if (wrk != null) {
-                                msg.senderNodeId(locNodeId);
-
-                                wrk.addMessage(msg);
-
-                                writeToSocket(sock, RES_OK);
-                            }
-                            else if (log.isDebugEnabled())
-                                log.debug("Discarding routed message because client has already
left: " + msg);
-
-                            continue;
-                        }
-
                         msg.senderNodeId(nodeId);
 
                         if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed76bf0c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
index 1a00359..887c502 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
@@ -52,9 +52,6 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable
{
     /** Topology version. */
     private long topVer;
 
-    /** Destination client node ID. */
-    private UUID destClientNodeId;
-
     /** Flags. */
     @GridToStringExclude
     private int flags;
@@ -178,20 +175,6 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable
{
     }
 
     /**
-     * @return Destination client node ID.
-     */
-    public UUID destinationClientNodeId() {
-        return destClientNodeId;
-    }
-
-    /**
-     * @param destClientNodeId Destination client node ID.
-     */
-    public void destinationClientNodeId(UUID destClientNodeId) {
-        this.destClientNodeId = destClientNodeId;
-    }
-
-    /**
      * @return Pending message index.
      */
     public short pendingIndex() {


Mime
View raw message