Merge branch ignite-sprint-3 into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7184f0f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7184f0f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7184f0f3 Branch: refs/heads/ignite-80 Commit: 7184f0f34ea6e869c084762b9d0541dabfe3dcba Parents: b99b655 Author: Alexey Goncharuk <[email protected]> Authored: Mon Apr 6 12:03:00 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 6 12:03:00 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 7 ------- .../processors/cache/transactions/IgniteTxManager.java | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7184f0f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- 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 95b45d7..5ca4bcd 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 @@ -2278,13 +2278,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * @return Collection of all system cache IDs. - */ - public Collection<Integer> systemCacheIds() { - return sysCacheIds; - } - - /** * @param name Cache name. * @param <K> type of keys. * @param <V> type of values. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7184f0f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index d61afaf..ec774fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -655,8 +655,11 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (tx != null && tx.topologyVersionSnapshot() != null) return tx; - for (int cacheId : cctx.cache().systemCacheIds()) { - tx = sysThreadMap.get(new TxThreadKey(threadId, cacheId)); + for (GridCacheContext cacheCtx : cctx.cache().context().cacheContexts()) { + if (!cacheCtx.systemTx()) + continue; + + tx = sysThreadMap.get(new TxThreadKey(threadId, cacheCtx.cacheId())); if (tx != null && tx.topologyVersionSnapshot() != null) return tx;
