You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/29 16:25:29 UTC
ignite git commit: IGNITE-3477 - Fixing exceptions test
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 4e42bb8a1 -> d0a59309a
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/d0a59309
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0a59309
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0a59309
Branch: refs/heads/ignite-3477-master
Commit: d0a59309acdd95a9ee6bb858782b514da1ba6077
Parents: 4e42bb8
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Mar 29 19:25:26 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:25:26 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/d0a59309/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/d0a59309/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 {