geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [08/14] incubator-geode git commit: GEODE-1042
Date Fri, 04 Mar 2016 17:30:20 GMT
GEODE-1042

shadowPR's entries will not have version tag. So enforce checking if versionTag
is null.


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

Branch: refs/heads/feature/GEODE-949-2
Commit: e7e1fc6660fc54ae449abed82fd0edbe06531050
Parents: 0ca2f2e
Author: zhouxh <gzhou@pivotal.io>
Authored: Wed Mar 2 17:02:49 2016 -0800
Committer: zhouxh <gzhou@pivotal.io>
Committed: Wed Mar 2 17:02:49 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/partitioned/FetchEntriesMessage.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e7e1fc66/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
index 0342164..fda15c4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
@@ -559,7 +559,7 @@ public final class FetchEntriesMessage extends PartitionMessage
               VersionTag versionTag = DataSerializer.readObject(in);
               
               //Fix for 47260 - canonicalize the mebmer ids to avoid an OOME
-              VersionSource id = versionTag.getMemberID();
+              VersionSource id = versionTag==null?null:versionTag.getMemberID();
               if (id != null) {
                 if(canonicalMembers.containsKey(id)) {
                   versionTag.setMemberID(canonicalMembers.get(id));


Mime
View raw message