ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [1/3] incubator-ignite git commit: Ignite - Enabled managed services tests and fixed NPE on node stop.
Date Sat, 06 Dec 2014 01:05:53 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/master 0a66bd57b -> 544b8b810


Ignite - Enabled managed services tests and fixed NPE on node stop.


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

Branch: refs/heads/master
Commit: ab6275cb5f992f5e9ab5964bd87ee6e90509d15c
Parents: 0a66bd5
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Fri Dec 5 14:43:02 2014 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Fri Dec 5 14:43:02 2014 -0800

----------------------------------------------------------------------
 .../cache/GridCachePartitionExchangeManager.java          |  4 ++--
 .../org/gridgain/testsuites/GridKernalSelfTestSuite.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab6275cb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
index f729c0f..e087377 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
@@ -256,8 +256,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
         for (GridDhtPartitionsExchangeFuture<K, V> f : exchFuts.values())
             f.onDone(new GridInterruptedException("Grid is stopping: " + cctx.gridName()));
 
-        exchFuts = null;
-
         U.cancel(exchWorker);
 
         if (log.isDebugEnabled())
@@ -265,6 +263,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
         U.join(exchWorker, log);
 
+        exchFuts = null;
+
         ResendTimeoutObject resendTimeoutObj = pendingResend.getAndSet(null);
 
         if (resendTimeoutObj != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab6275cb/modules/core/src/test/java/org/gridgain/testsuites/GridKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridKernalSelfTestSuite.java
b/modules/core/src/test/java/org/gridgain/testsuites/GridKernalSelfTestSuite.java
index b289235..e722efb 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridKernalSelfTestSuite.java
@@ -61,11 +61,11 @@ public class GridKernalSelfTestSuite extends TestSuite {
         suite.addTestSuite(GridLocalEventListenerSelfTest.class);
 
         // Managed Services.
-//        suite.addTestSuite(GridServiceProcessorSingleNodeSelfTest.class); TODO GG-9141
-//        suite.addTestSuite(GridServiceProcessorMultiNodeSelfTest.class);
-//        suite.addTestSuite(GridServiceProcessorMultiNodeConfigSelfTest.class);
-//        suite.addTestSuite(GridServiceProcessorProxySelfTest.class);
-//        suite.addTestSuite(GridServiceReassignmentSelfTest.class);
+        suite.addTestSuite(GridServiceProcessorSingleNodeSelfTest.class);
+        suite.addTestSuite(GridServiceProcessorMultiNodeSelfTest.class);
+        suite.addTestSuite(GridServiceProcessorMultiNodeConfigSelfTest.class);
+        suite.addTestSuite(GridServiceProcessorProxySelfTest.class);
+        suite.addTestSuite(GridServiceReassignmentSelfTest.class);
 
         return suite;
     }


Mime
View raw message