ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [50/50] incubator-ignite git commit: Merge branch ignite-sprint-3 into ignite-80
Date Sat, 11 Apr 2015 04:40:23 GMT
Merge branch ignite-sprint-3 into ignite-80


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

Branch: refs/heads/ignite-80
Commit: a7f34118664777886782dd934dcd876db1b2762b
Parents: 4c0436f
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Fri Apr 10 21:39:03 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Fri Apr 10 21:39:03 2015 -0700

----------------------------------------------------------------------
 .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +-
 .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7f34118/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index f6f904a..26680bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -438,7 +438,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
             }
 
             @Override public void onExchange(UUID joiningNodeId, UUID nodeId, long topVer,
Map<Integer, Serializable> data) {
-                for (Map.Entry<Serializable, Object> e : data.entrySet()) {
+                for (Map.Entry<Integer, Serializable> e : data.entrySet()) {
                     GridComponent comp = null;
 
                     for (GridComponent c : ctx.components()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7f34118/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 98e048d..d8e2030 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -746,11 +746,13 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements
Discov
     /**
      * @param joiningNodeID Joining node ID.
      * @param nodeId Remote node ID for which data is provided.
+     * @param topVer Topology version.
      * @param data Collection of marshalled discovery data objects from different components.
      * @param clsLdr Class loader for discovery data unmarshalling.
      */
     protected void onExchange(UUID joiningNodeID,
         UUID nodeId,
+        long topVer,
         Map<Integer, byte[]> data,
         ClassLoader clsLdr)
     {
@@ -767,7 +769,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements
Discov
             }
         }
 
-        exchange.onExchange(joiningNodeID, nodeId, data0);
+        exchange.onExchange(joiningNodeID, nodeId, topVer, data0);
     }
 
     /**


Mime
View raw message