ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] ignite git commit: ignite-1.5 Should not wait on preloader sync future for system caches callbacks.
Date Tue, 01 Dec 2015 08:08:23 GMT
ignite-1.5 Should not wait on preloader sync future for system caches callbacks.


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

Branch: refs/heads/ignite-1537
Commit: b0b1233b7f40ec3a7508a1688740c2345ef7674b
Parents: 83ce596
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Dec 1 11:08:13 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Dec 1 11:08:13 2015 +0300

----------------------------------------------------------------------
 .../CachePutEventListenerErrorSelfTest.java     | 35 +++++++++++---------
 .../cache/GridCacheClearSelfTest.java           |  9 +++--
 2 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b0b1233b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
index 0e0e521..bf8f615 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
@@ -64,21 +64,26 @@ public class CachePutEventListenerErrorSelfTest extends GridCommonAbstractTest
{
 
         Ignition.setClientMode(true);
 
-        Ignite ignite = startGrid("client");
-
-        ignite.events().remoteListen(
-            new IgniteBiPredicate<UUID, Event>() {
-                @Override public boolean apply(UUID uuid, Event evt) {
-                    return true;
-                }
-            },
-            new IgnitePredicate<Event>() {
-                @Override public boolean apply(Event evt) {
-                    throw new NoClassDefFoundError("XXX");
-                }
-            },
-            EventType.EVT_CACHE_OBJECT_PUT
-        );
+        try {
+            Ignite ignite = startGrid("client");
+
+            ignite.events().remoteListen(
+                new IgniteBiPredicate<UUID, Event>() {
+                    @Override public boolean apply(UUID uuid, Event evt) {
+                        return true;
+                    }
+                },
+                new IgnitePredicate<Event>() {
+                    @Override public boolean apply(Event evt) {
+                        throw new NoClassDefFoundError("XXX");
+                    }
+                },
+                EventType.EVT_CACHE_OBJECT_PUT
+            );
+        }
+        finally {
+            Ignition.setClientMode(false);
+        }
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/b0b1233b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
index 5e14f14..67316b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
@@ -61,8 +61,13 @@ public class GridCacheClearSelfTest extends GridCommonAbstractTest {
 
         Ignition.setClientMode(true);
 
-        startGrid("client1");
-        startGrid("client2");
+        try {
+            startGrid("client1");
+            startGrid("client2");
+        }
+        finally {
+            Ignition.setClientMode(false);
+        }
     }
 
     /** {@inheritDoc} */


Mime
View raw message