commit | 81e0c401fb5d7a1731621d60e60d5ac4b03435d9 | [log] [tgz] |
---|---|---|
author | Valentin Kulichenko <valentin.kulichenko@gmail.com> | Tue Sep 01 14:44:47 2015 -0700 |
committer | Valentin Kulichenko <valentin.kulichenko@gmail.com> | Tue Sep 01 14:44:47 2015 -0700 |
tree | fd5d642c4f264f8c58a3fd51946c4cf3002602bb | |
parent | dadf4bd3beb5fde31b89b0c2a0fbfb3aa5b46e3a [diff] | |
parent | 3321645392e25a2d0ed5e469de57d6d1a2dc173d [diff] |
Merge branch 'ignite-993' into ignite-1.3.3-p7
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c1d0d17..687c987 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1648,7 +1648,7 @@ GridCacheIoManager ioMgr = new GridCacheIoManager(); CacheJtaManagerAdapter jta = JTA.createOptional(); - + return new GridCacheSharedContext( kernalCtx, tm, @@ -2860,7 +2860,7 @@ * Cancel all user operations. */ public void cancelUserOperations() { - for (GridCacheAdapter<?, ?> cache : caches.values()) + for (GridCacheAdapter<?, ?> cache : stoppedCaches.values()) cache.ctx.mvcc().cancelClientFutures(); }