You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/07 15:36:32 UTC
[2/3] ignite git commit: Added in the test workaround for IGNITE-1365.
Added in the test workaround for IGNITE-1365.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1fe7e956
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1fe7e956
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1fe7e956
Branch: refs/heads/master
Commit: 1fe7e956995ca168e0a701d1194bd7b01adb8dec
Parents: 3e09aa3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 7 15:27:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 7 15:27:25 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteDaemonNodeMarshallerCacheTest.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1fe7e956/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
index 8e19fe9..d463a37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
@@ -22,6 +22,9 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -104,6 +107,13 @@ public class IgniteDaemonNodeMarshallerCacheTest extends GridCommonAbstractTest
awaitPartitionMapExchange();
+ // Workaround for IGNITE-1365.
+ IgniteInternalFuture<?> fut = ((IgniteKernal) daemonNode).context().cache().context().exchange().
+ affinityReadyFuture(new AffinityTopologyVersion(2, 0));
+
+ if (fut != null)
+ fut.get();
+
TestClass1 res1 = daemonNode.compute(daemonNode.cluster().forRemotes()).call(new TestCallable1());
assertNotNull(res1);