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 2FE3A17C2A for ; Fri, 4 Sep 2015 21:14:44 +0000 (UTC) Received: (qmail 96654 invoked by uid 500); 4 Sep 2015 21:14:44 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 96566 invoked by uid 500); 4 Sep 2015 21:14:44 -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 96555 invoked by uid 99); 4 Sep 2015 21:14:44 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2015 21:14:44 +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 49BB0C08D9 for ; Fri, 4 Sep 2015 21:14:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 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, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 Wx0acrhV_fof for ; Fri, 4 Sep 2015 21:14:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id B72AB20FF4 for ; Fri, 4 Sep 2015 21:14:38 +0000 (UTC) Received: (qmail 92418 invoked by uid 99); 4 Sep 2015 21:13:23 -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; Fri, 04 Sep 2015 21:13:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5BE1E0414; Fri, 4 Sep 2015 21:13:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.incubator.apache.org Date: Fri, 04 Sep 2015 21:13:25 -0000 Message-Id: In-Reply-To: <29631f00ea734052b45e195095fb88b7@git.apache.org> References: <29631f00ea734052b45e195095fb88b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-geode git commit: GEODE-77 added an additional catch/retry of NoAvailableLocatorsException GEODE-77 added an additional catch/retry of NoAvailableLocatorsException Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7956d065 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7956d065 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7956d065 Branch: refs/heads/feature/GEODE-77 Commit: 7956d06524fcba1f5dd329dd4ae13faa7b024d2a Parents: e21dc11 Author: Bruce Schuchardt Authored: Fri Sep 4 14:13:06 2015 -0700 Committer: Bruce Schuchardt Committed: Fri Sep 4 14:13:06 2015 -0700 ---------------------------------------------------------------------- .../cache/client/internal/AutoConnectionSourceDUnitTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7956d065/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java index 1fdb67c..d600472 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java @@ -384,8 +384,9 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase { System.err.println("Attempt: " + (i++)); putInVM(vm, regionName, key, value); break; - } catch(dunit.RMIException e) { - if(!(e.getCause() instanceof NoAvailableServersException)) { + } catch (NoAvailableServersException | dunit.RMIException e) { + if( !(e instanceof NoAvailableServersException) + && !(e.getCause() instanceof NoAvailableServersException)) { throw e; } if(remaining <= 0) {