You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/10/22 19:36:22 UTC
ignite git commit: IGNITE-426 Fix NPE
Repository: ignite
Updated Branches:
refs/heads/ignite-426-2-reb 6b7e0252e -> 0b6cf3d9b
IGNITE-426 Fix NPE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b6cf3d9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b6cf3d9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b6cf3d9
Branch: refs/heads/ignite-426-2-reb
Commit: 0b6cf3d9b122db2ca06910f55415ea92e111aa30
Parents: 6b7e025
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Oct 22 20:36:20 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Oct 22 20:36:20 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6cf3d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 0a43a6d..d10d86b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1832,7 +1832,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
null,
null,
false,
- updateIdx0);
+ updateIdx0 == null ? 0 : updateIdx0);
}
// Will update something.
else {
@@ -1999,7 +1999,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
null,
null,
false,
- -1);
+ updateIdx0 == null ? 0 : updateIdx0);
}
}
@@ -2148,7 +2148,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
null,
null,
false,
- updateIdx0);
+ updateIdx0 == null ? 0 : updateIdx0);
else if (interceptorVal != updated0) {
updated0 = cctx.unwrapTemporary(interceptorVal);
@@ -2230,7 +2230,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
null,
null,
false,
- updateIdx0);
+ updateIdx0 == null ? 0 : updateIdx0);
}
if (writeThrough)