ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/3] incubator-ignite git commit: #ignite-784: change version.
Date Fri, 24 Apr 2015 12:13:14 GMT
#ignite-784: change version.


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

Branch: refs/heads/ignite-784-1
Commit: 99ffaf42f4984f31b162458f5a5178289a58af8c
Parents: 6bd55a8
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Apr 24 15:10:52 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Apr 24 15:10:52 2015 +0300

----------------------------------------------------------------------
 .../processors/datastreamer/DataStreamProcessor.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ffaf42/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index 3e6f207..c928572 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.datastreamer;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.managers.communication.*;
 import org.apache.ignite.internal.managers.deployment.*;
@@ -37,7 +38,6 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.internal.GridTopic.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 
 /**
@@ -45,7 +45,7 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
  */
 public class DataStreamProcessor<K, V> extends GridProcessorAdapter {
     /** The lowest version of ignite that is compatible with current version. */
-    private static IgniteProductVersion COMPATIBLE_VERSION_SINCE = IgniteProductVersion.fromString("1.0.4");
+    private static IgniteProductVersion COMPATIBLE_VERSION_SINCE = IgniteProductVersion.fromString("1.1.0");
 
     /** Loaders map (access is not supposed to be highly concurrent). */
     private Collection<DataStreamerImpl> ldrs = new GridConcurrentHashSet<>();
@@ -195,9 +195,10 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter
{
             AffinityTopologyVersion rmtAffVer = req.topologyVersion();
 
             if (rmtAffVer == null) {
-                IgniteProductVersion rmtVer = ctx.discovery().node(nodeId).version();
+                ClusterNode rmtNode =  ctx.discovery().node(nodeId);
 
-                assert rmtVer.compareTo(COMPATIBLE_VERSION_SINCE) < 0;
+                if (rmtNode != null)
+                    assert rmtNode.version().compareTo(COMPATIBLE_VERSION_SINCE) < 0;
             }
             else {
                 if (locAffVer.compareTo(rmtAffVer) < 0) {


Mime
View raw message