Repository: ignite Updated Branches: refs/heads/ignite-6149 21ca454f9 -> 7441fe30c
ignite-6149 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e26bc041 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e26bc041 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e26bc041 Branch: refs/heads/ignite-6149 Commit: e26bc0419468a77855fc59435467a33c673f75d0 Parents: 21ca454 Author: sboikov <[email protected]> Authored: Fri Sep 15 14:56:29 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 15 14:56:29 2017 +0300 ---------------------------------------------------------------------- .../cache/mvcc/CacheCoordinatorsSharedManager.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e26bc041/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java ---------------------------------------------------------------------- diff --git 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 index dc7e4c8..8b70d3e 100644 --- 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 @@ -462,7 +462,7 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager * @param txId Transaction ID. * @return Counter. */ - private synchronized MvccCoordinatorVersionResponse assignTxCounter(GridCacheVersion txId, long futId) { + private MvccCoordinatorVersionResponse assignTxCounter(GridCacheVersion txId, long futId) { assert crdVer != 0; long nextCtr = mvccCntr.incrementAndGet(); @@ -495,20 +495,11 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager * @param txId Transaction ID. */ private void onTxDone(GridCacheVersion txId) { - GridFutureAdapter fut; // TODO IGNITE-3478. + Long cntr = activeTxs.remove(txId); - synchronized (this) { - Long cntr = activeTxs.remove(txId); - - assert cntr != null; - - committedCntr.setIfGreater(cntr); + assert cntr != null; - fut = waitTxFuts.remove(cntr); - } - - if (fut != null) - fut.onDone(); + committedCntr.setIfGreater(cntr); } /**
