ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject incubator-ignite git commit: # IGNITE-283: Bug fix.
Date Thu, 19 Feb 2015 13:04:36 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-283 182594330 -> 404a695af


# IGNITE-283: Bug 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/404a695a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/404a695a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/404a695a

Branch: refs/heads/ignite-283
Commit: 404a695af6ac71ac93923387c85dd55c1109517a
Parents: 1825943
Author: vozerov <vozerov@gridgain.com>
Authored: Thu Feb 19 16:04:29 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Thu Feb 19 16:04:29 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/404a695a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a252169..fe037e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1723,7 +1723,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
                     if (updRes.sendToDht()) { // Send to backups even in case of remove-remove
scenarios.
                         GridCacheVersionConflictContext<K, V> conflictCtx = updRes.conflictResolveResult();
 
-                        if (ctx == null)
+                        if (conflictCtx == null)
                             newConflictVer = null;
                         else if (conflictCtx.isMerge()) {
                             newConflictVer = null; // Conflict version is discarded in case
of merge.


Mime
View raw message