ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [17/19] ignite git commit: IGNITE-426 Fix NPE
Date Fri, 23 Oct 2015 11:52:19 GMT
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/5fd0d535
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fd0d535
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fd0d535

Branch: refs/heads/ignite-426-2-reb
Commit: 5fd0d535b525dd59ffe40aac0a8ff522ede3688d
Parents: 7363cdd
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Oct 22 20:36:20 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Oct 23 14:50:13 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/5fd0d535/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)


Mime
View raw message