geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasonhu...@apache.org
Subject geode git commit: GEODE-2287: Fixed possible conflation NPE in HARegionQueue during gii
Date Wed, 11 Jan 2017 00:27:50 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 35d123f23 -> 43399189d


GEODE-2287: Fixed possible conflation NPE in HARegionQueue during gii


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/43399189
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/43399189
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/43399189

Branch: refs/heads/develop
Commit: 43399189db2a122e0cc17191636a61a1b5ddc094
Parents: 35d123f
Author: Jason Huynh <huynhja@gmail.com>
Authored: Thu Dec 22 11:13:24 2016 -0800
Committer: Jason Huynh <huynhja@gmail.com>
Committed: Tue Jan 10 15:47:03 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/geode/internal/cache/ha/HARegionQueue.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/43399189/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index 8d255c7..70224f2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -466,7 +466,7 @@ public class HARegionQueue implements RegionQueue {
           while (iterator.hasNext()) {
             mapEntry = (Map.Entry) iterator.next();
             Conflatable val = (Conflatable) mapEntry.getValue();
-            if (val.getEventId() != null) { // bug #44959 null event ID caused NPE
+            if (val != null && val.getEventId() != null) {
               counterInRegion = ((Long) mapEntry.getKey()).intValue();
               // TODO: remove this assertion
               Assert.assertTrue(counterInRegion > max);


Mime
View raw message