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 3D94718FA4 for ; Thu, 5 Nov 2015 22:30:40 +0000 (UTC) Received: (qmail 33936 invoked by uid 500); 5 Nov 2015 22:30:40 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 33902 invoked by uid 500); 5 Nov 2015 22:30:40 -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 33893 invoked by uid 99); 5 Nov 2015 22:30:40 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2015 22:30:40 +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 11D52C070B for ; Thu, 5 Nov 2015 22:30:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 3TpigMgItqQE for ; Thu, 5 Nov 2015 22:30:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id EF52724CA1 for ; Thu, 5 Nov 2015 22:30:30 +0000 (UTC) Received: (qmail 33489 invoked by uid 99); 5 Nov 2015 22:30:29 -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; Thu, 05 Nov 2015 22:30:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A88DAE56E9; Thu, 5 Nov 2015 22:30:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashvin@apache.org To: commits@geode.incubator.apache.org Date: Thu, 05 Nov 2015 22:30:32 -0000 Message-Id: In-Reply-To: <8bfd6397962247558358b2fec8200965@git.apache.org> References: <8bfd6397962247558358b2fec8200965@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/11] incubator-geode git commit: GEODE-296: change test to handle EntryDestroyedException GEODE-296: change test to handle EntryDestroyedException Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/97c53517 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/97c53517 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/97c53517 Branch: refs/heads/feature/GEODE-409 Commit: 97c53517e11e23936d488e2cca25f733a33f898e Parents: 6b1c780 Author: Darrel Schneider Authored: Tue Nov 3 14:53:07 2015 -0800 Committer: Darrel Schneider Committed: Tue Nov 3 14:53:07 2015 -0800 ---------------------------------------------------------------------- .../tier/sockets/HAInterestPart2DUnitTest.java | 24 ++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/97c53517/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java index b861786..eaa1ca1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java @@ -272,12 +272,28 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest { public boolean done() { Region.Entry e1 = r1.getEntry(k1); Region.Entry e2 = r1.getEntry(k2); - if (e1 == null || !server_k1_updated.equals(e1.getValue())) { - excuse = "k1=" + (e1 == null ? "null" : e1.getValue()); + Object v1 = null; + if (e1 != null) { + try { + v1 = e1.getValue(); + } catch (EntryDestroyedException ignore) { + // handled to fix GEODE-296 + } + } + if (e1 == null || !server_k1_updated.equals(v1)) { + excuse = "v1=" + v1; return false; } - if (e2 == null || !server_k2.equals(e2.getValue())) { - excuse = "k2=" + (e2 == null ? "null" : e2.getValue()); + Object v2 = null; + if (e2 != null) { + try { + v2 = e2.getValue(); + } catch (EntryDestroyedException ignore) { + // handled to fix GEODE-296 + } + } + if (e2 == null || !server_k2.equals(v2)) { + excuse = "v2=" + v2; return false; } return true;