Repository: ignite Updated Branches: refs/heads/ignite-1537 1c2513d23 -> cd02f2cdb
ignite-2146 Avoid hang in 'cache.get' if topology locked. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd02f2cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd02f2cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd02f2cd Branch: refs/heads/ignite-1537 Commit: cd02f2cdbb9d5955744aa1c88587480ef3f6582f Parents: 1c2513d Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 16 17:25:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 16 17:25:18 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd02f2cd/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 5212eee..380c163 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 @@ -3343,7 +3343,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { * @throws IgniteException If transaction exist. */ private void checkEmptyTransactions() throws IgniteException { - if (sharedCtx.lockedTopologyVersion(null) != null) + if (transactions().tx() != null || sharedCtx.lockedTopologyVersion(null) != null) throw new IgniteException("Cannot start/stop cache within lock or transaction."); }
