IGNITE-3477 - Fixing exceptions test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f40516e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f40516e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f40516e Branch: refs/heads/ignite-3477-master Commit: 9f40516e5ec29f1ead4eff6dbc9d3784f5555e52 Parents: 95b48a9 Author: Alexey Goncharuk <[email protected]> Authored: Wed Mar 29 19:25:26 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Mar 29 19:29:38 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/IgniteCacheOffheapManagerImpl.java | 3 +-- .../internal/processors/cache/query/GridCacheQueryManager.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9f40516e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 88cb708..8b8de19 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1109,8 +1109,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple try { CacheDataRow oldRow = dataTree.remove(new SearchRow(key)); - if (oldRow != null) - finishRemove(key, oldRow); + finishRemove(key, oldRow); } finally { busyLock.leaveBusy(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9f40516e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 00a4b2e..e1ed3c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -506,7 +506,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.kernalContext().indexing().remove(space, key0); } - if(qryProcEnabled) + // val may be null if we have no previous value. We should not call processor in this case. + if(qryProcEnabled && val != null) qryProc.remove(space, key, partId, val, ver); } finally {
