Merge remote-tracking branch 'remotes/origin/ignite-3478' into ignite-3479
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a386a3c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a386a3c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a386a3c Branch: refs/heads/ignite-3479 Commit: 4a386a3c5ccf756bd73dc57142bcae76563b2152 Parents: b7a64fe 9ae39c4 Author: sboikov <sboi...@gridgain.com> Authored: Fri Sep 22 16:16:15 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Sep 22 16:16:15 2017 +0300 ---------------------------------------------------------------------- .../mvcc/CacheCoordinatorsSharedManager.java | 4 +- .../cache/mvcc/CacheMvccTransactionsTest.java | 88 ++++++++++++++------ 2 files changed, 65 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4a386a3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java index ef5d1b8,0050659..af42f44 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java @@@ -607,10 -566,12 +607,12 @@@ public class CacheCoordinatorsSharedMan assert left >= 0 : left; if (left == 0) { - Integer rmvd = activeQueries.remove(mvccCntr); + boolean rmv = activeQueries.remove(mvccCntr, cntr); - assert rmvd != null; + assert rmv; } + else + activeQueries.put(mvccCntr, left); } /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4a386a3c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java ----------------------------------------------------------------------
