ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpav...@apache.org
Subject ignite git commit: IGNITE-5954 Remove obsolete near cache value from primary\backup node - Fixes #4052.
Date Fri, 08 Jun 2018 13:58:55 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 051648b52 -> 4f6e02cdd


IGNITE-5954 Remove obsolete near cache value from primary\backup node - Fixes #4052.

Signed-off-by: dpavlov <dpavlov@apache.org>


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

Branch: refs/heads/master
Commit: 4f6e02cdd002c6bcca0f50bbceb8efe307b0f106
Parents: 051648b
Author: voipp <alkuznetsov.sb@gmail.com>
Authored: Fri Jun 8 16:58:42 2018 +0300
Committer: dpavlov <dpavlov@apache.org>
Committed: Fri Jun 8 16:58:42 2018 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4f6e02cd/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 9cd685b..187f1b0 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
@@ -3233,12 +3233,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
         GridDhtAtomicUpdateResponse dhtRes = null;
 
-        if (req.nearSize() > 0) {
-            List<KeyCacheObject> nearEvicted;
+        if (req.nearSize() > 0 || req.obsoleteNearKeysSize() > 0) {
+            List<KeyCacheObject> nearEvicted = null;
 
             if (isNearEnabled(ctx))
                 nearEvicted = ((GridNearAtomicCache<K, V>)near()).processDhtAtomicUpdateRequest(nodeId,
req, nearRes);
-            else {
+            else if (req.nearSize() > 0) {
                 nearEvicted = new ArrayList<>(req.nearSize());
 
                 for (int i = 0; i < req.nearSize(); i++)


Mime
View raw message