ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-5075
Date Tue, 30 May 2017 17:48:53 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075 e914572ff -> 76e059664


ignite-5075


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

Branch: refs/heads/ignite-5075
Commit: 76e0596647c223136c8f4b5b394cfdc828f79cc6
Parents: e914572
Author: sboikov <sboikov@gridgain.com>
Authored: Tue May 30 20:48:40 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue May 30 20:48:40 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheMapEntry.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/76e05966/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 0b4aab2..8a82187 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -981,7 +981,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
             if (cctx.deferredDelete() && deletedUnlocked() && !isInternal()
&& !detached())
                 deletedUnlocked(false);
 
-            updateCntr0 = nextPartitionCounter(topVer, tx.local(), updateCntr);
+            updateCntr0 = nextPartitionCounter(topVer, tx == null || tx.local(), updateCntr);
 
             if (updateCntr != null && updateCntr != 0)
                 updateCntr0 = updateCntr;
@@ -1160,7 +1160,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                 }
             }
 
-            updateCntr0 = nextPartitionCounter(topVer, tx.local(), updateCntr);
+            updateCntr0 = nextPartitionCounter(topVer, tx == null || tx.local(), updateCntr);
 
             if (updateCntr != null && updateCntr != 0)
                 updateCntr0 = updateCntr;


Mime
View raw message