ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [45/50] [abbrv] ignite git commit: IGNITE-426 Fix NPE
Date Wed, 28 Oct 2015 13:15:21 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/461c55a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/461c55a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/461c55a5

Branch: refs/heads/ignite-426-2-reb
Commit: 461c55a57cb35e26abbc0e27838fa3f852c96090
Parents: a8882fd
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Oct 22 20:36:20 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Wed Oct 28 15:24:34 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/461c55a5/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 b445619..81b81e3 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
@@ -1893,7 +1893,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                             null,
                             null,
                             false,
-                            updateIdx0);
+                            updateIdx0 == null ? 0 : updateIdx0);
                     }
                     // Will update something.
                     else {
@@ -2060,7 +2060,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                         null,
                         null,
                         false,
-                        -1);
+                        updateIdx0 == null ? 0 : updateIdx0);
                 }
             }
 
@@ -2209,7 +2209,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                             null,
                             null,
                             false,
-                            updateIdx0);
+                            updateIdx0 == null ? 0 : updateIdx0);
                     else if (interceptorVal != updated0) {
                         updated0 = cctx.unwrapTemporary(interceptorVal);
 
@@ -2291,7 +2291,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter
impleme
                             null,
                             null,
                             false,
-                            updateIdx0);
+                            updateIdx0 == null ? 0 : updateIdx0);
                 }
 
                 if (writeThrough)


Mime
View raw message