Fixed test IgniteClusterActivateDeactivateTestWithPersistence.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54585ab3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54585ab3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54585ab3 Branch: refs/heads/ignite-5658 Commit: 54585ab3ea98b3236ac2635440ed496fb24742d8 Parents: 32f5cbc Author: sboikov <sboi...@gridgain.com> Authored: Tue Jul 18 17:52:51 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jul 18 17:52:51 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/query/GridCacheQueryResponse.java | 4 ++-- .../cache/IgniteClusterActivateDeactivateTest.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/54585ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java index 521aacf..13e0915 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java @@ -130,10 +130,10 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa if (err != null && errBytes == null) errBytes = U.marshal(ctx, err); - if (metaDataBytes == null) + if (metaDataBytes == null && metadata != null) metaDataBytes = marshalCollection(metadata, cctx); - if (dataBytes == null) + if (dataBytes == null && data != null) dataBytes = marshalCollection(data, cctx); if (addDepInfo && !F.isEmpty(data)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/54585ab3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java index 8a604be..cb7c274 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java @@ -366,13 +366,18 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest startWithCaches1(srvs, clients); - if (initiallyActive && persistenceEnabled()) + int minorVer = 1; + + if (initiallyActive && persistenceEnabled()) { ignite(0).active(true); + minorVer++; + } + if (blockMsgNodes.length == 0) blockMsgNodes = new int[]{1}; - final AffinityTopologyVersion STATE_CHANGE_TOP_VER = new AffinityTopologyVersion(srvs + clients, 1); + final AffinityTopologyVersion STATE_CHANGE_TOP_VER = new AffinityTopologyVersion(srvs + clients, minorVer); List<TestRecordingCommunicationSpi> spis = new ArrayList<>();
