You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/10/06 09:32:25 UTC
ignite git commit: IGNITE-8714 Keep old semantic for REMOVED event
for internal listeners
Repository: ignite
Updated Branches:
refs/heads/master 1047b6495 -> 6e0ff06f8
IGNITE-8714 Keep old semantic for REMOVED event for internal listeners
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e0ff06f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e0ff06f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e0ff06f
Branch: refs/heads/master
Commit: 6e0ff06f8e309657a16c94da605348d9c3b804ad
Parents: 1047b64
Author: sboikov <sb...@apache.org>
Authored: Sat Oct 6 12:30:49 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Sat Oct 6 12:30:49 2018 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 ++-
.../cache/query/continuous/CacheContinuousQueryManager.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6e0ff06f/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 8edefa2..c7b6677 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
@@ -1793,7 +1793,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
// This call will convert entry processor invocation results to cache object instances.
// Must be done outside topology read lock to avoid deadlocks.
- res.returnValue().marshalResult(ctx);
+ if (res.returnValue() != null)
+ res.returnValue().marshalResult(ctx);
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6e0ff06f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index ab60f47..aa276cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -395,7 +395,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
cctx.cacheId(),
evtType,
key,
- evtType == REMOVED && lsnr.oldValueRequired() ? oldVal : newVal,
+ (!internal && evtType == REMOVED && lsnr.oldValueRequired()) ? oldVal : newVal,
lsnr.oldValueRequired() ? oldVal : null,
lsnr.keepBinary(),
partId,