Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-gg-9828 fb60ee21b -> bc0f87d60


#gg-9828: fix cache replace.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc0f87d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc0f87d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc0f87d6

Branch: refs/heads/ignite-gg-9828
Commit: bc0f87d60f9619e082a006a5588f3f82515032e3
Parents: fb60ee2
Author: ivasilinets <vasilinetc....@gmail.com>
Authored: Thu Mar 12 01:10:08 2015 +0300
Committer: ivasilinets <vasilinetc....@gmail.com>
Committed: Thu Mar 12 01:10:08 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc0f87d6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 7630461..16b112f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -735,10 +735,10 @@ public final class GridDhtTxPrepareFuture<K, V> extends 
GridCompoundIdentityFutu
 
         try {
             // We are holding transaction-level locks for entries here, so we 
can get next write version.
-            tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
-
             onEntriesLocked();
 
+            tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
+
             {
                 Map<UUID, GridDistributedTxMapping> futDhtMap = new 
HashMap<>();
                 Map<UUID, GridDistributedTxMapping> futNearMap = new 
HashMap<>();

Reply via email to