Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 221A41976F for ; Tue, 8 Mar 2016 00:25:12 +0000 (UTC) Received: (qmail 9311 invoked by uid 500); 8 Mar 2016 00:25:12 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 9281 invoked by uid 500); 8 Mar 2016 00:25:12 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 9271 invoked by uid 99); 8 Mar 2016 00:25:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2016 00:25:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8488EC0D5B for ; Tue, 8 Mar 2016 00:25:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id jBeh9lSiBr1l for ; Tue, 8 Mar 2016 00:25:10 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id AD4B45FB7B for ; Tue, 8 Mar 2016 00:25:09 +0000 (UTC) Received: (qmail 9058 invoked by uid 99); 8 Mar 2016 00:25:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2016 00:25:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33FCCDFC6F; Tue, 8 Mar 2016 00:25:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.incubator.apache.org Date: Tue, 08 Mar 2016 00:25:11 -0000 Message-Id: <83cc47e2f9f8422d885f5548b2917f2d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/11] incubator-geode git commit: GEODE-1042 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-982 Commit: e7e1fc6660fc54ae449abed82fd0edbe06531050 Parents: 0ca2f2e Author: zhouxh Authored: Wed Mar 2 17:02:49 2016 -0800 Committer: zhouxh 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));