You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/21 13:52:18 UTC

[17/40] incubator-ignite git commit: # ignite-1.3.3-p3 retryReadyFuture can be null for ClusterTopologyCheckedException

# ignite-1.3.3-p3 retryReadyFuture can be null for ClusterTopologyCheckedException


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

Branch: refs/heads/ignite-1258
Commit: ef1495006fc011e998462ef14804efabdfeb7020
Parents: 5e81456
Author: sboikov <sb...@gridgain.com>
Authored: Thu Aug 20 11:06:00 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Aug 20 11:06:00 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef149500/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index e259084..404c806 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -585,7 +585,8 @@ public abstract class IgniteUtils {
 
                 ClusterTopologyCheckedException checked = (ClusterTopologyCheckedException)e;
 
-                topEx.retryReadyFuture(new IgniteFutureImpl<>(checked.retryReadyFuture()));
+                if (checked.retryReadyFuture() != null)
+                    topEx.retryReadyFuture(new IgniteFutureImpl<>(checked.retryReadyFuture()));
 
                 return topEx;
             }