ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: workaround for ignite-1365
Date Fri, 04 Sep 2015 11:54:54 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1365 7cec5b71b -> 5dbe1ddbf


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/5dbe1ddb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5dbe1ddb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5dbe1ddb

Branch: refs/heads/ignite-1365
Commit: 5dbe1ddbf578057670770d466b3294f750d32dfd
Parents: 7cec5b7
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Sep 4 14:54:40 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Sep 4 14:54:40 2015 +0300

----------------------------------------------------------------------
 .../cache/IgniteDaemonNodeMarshallerCacheTest.java          | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5dbe1ddb/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..e91bd63 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,12 @@ public class IgniteDaemonNodeMarshallerCacheTest extends GridCommonAbstractTest
 
         awaitPartitionMapExchange();
 
+        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);


Mime
View raw message