ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [2/3] ignite git commit: ignite-3477-master fix IgniteDaemonNodeMarshallerCacheTest.testMarshalOnDaemonNode1
Date Tue, 28 Mar 2017 07:44:42 GMT
ignite-3477-master fix IgniteDaemonNodeMarshallerCacheTest.testMarshalOnDaemonNode1


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

Branch: refs/heads/ignite-3477-master
Commit: 832665e91ef9a51c246e754533367debcb38ba00
Parents: 58e814e
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Mon Mar 27 18:13:20 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Tue Mar 28 10:44:01 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cluster/GridClusterStateProcessor.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/832665e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index e5919e0..1286ba9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -219,7 +219,10 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
 
     /** {@inheritDoc} */
     @Override public void onGridDataReceived(DiscoveryDataBag.GridDiscoveryData data) {
-        globalState = (ClusterState)data.commonData();
+        ClusterState state = (ClusterState)data.commonData();
+
+        if (state != null)
+            globalState = state;
     }
 
     /**


Mime
View raw message