ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/43] incubator-ignite git commit: ignite-656: transactional pessemisitc mode fix
Date Thu, 23 Apr 2015 18:13:21 GMT
ignite-656: transactional pessemisitc mode fix


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

Branch: refs/heads/ignite-sprint-4
Commit: 1361d1c574390c9c1b5f12872b139a9155f294ac
Parents: d657f92
Author: Denis Magda <dmagda@gridgain.com>
Authored: Mon Apr 20 21:25:42 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Mon Apr 20 21:25:42 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/colocated/GridDhtColocatedCache.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1361d1c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 4203934..65fe785 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -362,6 +362,8 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
 
         GridNearTxLocal txx = (GridNearTxLocal)tx;
 
+        CacheOperationContext opCtx = ctx.operationContextPerCall();
+
         GridDhtColocatedLockFuture<K, V> fut = new GridDhtColocatedLockFuture<>(ctx,
             keys,
             txx,
@@ -370,7 +372,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
             timeout,
             accessTtl,
             CU.empty0(),
-            txx != null && txx.storeEnabled());
+            opCtx != null && opCtx.skipStore());
 
         // Future will be added to mvcc only if it was mapped to remote nodes.
         fut.map();


Mime
View raw message