You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2016/03/03 19:03:50 UTC
incubator-geode git commit: GEODE-1042
Repository: incubator-geode
Updated Branches:
refs/heads/develop 0ca2f2ea1 -> e7e1fc666
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/develop
Commit: e7e1fc6660fc54ae449abed82fd0edbe06531050
Parents: 0ca2f2e
Author: zhouxh <gz...@pivotal.io>
Authored: Wed Mar 2 17:02:49 2016 -0800
Committer: zhouxh <gz...@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));