You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/30 17:25:12 UTC
[02/34] ignite git commit: ignite-3477-master fix
IgniteDaemonNodeMarshallerCacheTest.testMarshalOnDaemonNode1
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/5626f1c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5626f1c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5626f1c0
Branch: refs/heads/ignite-3477-master
Commit: 5626f1c0736a1fe6b4ee0435ee642289885236d7
Parents: 6d7eb44
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Mar 27 18:13:20 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Mon Mar 27 18:13:20 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/5626f1c0/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;
}
/**