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 B156018ED6 for ; Fri, 8 Jan 2016 18:42:12 +0000 (UTC) Received: (qmail 60679 invoked by uid 500); 8 Jan 2016 18:42:12 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 60644 invoked by uid 500); 8 Jan 2016 18:42: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 60635 invoked by uid 99); 8 Jan 2016 18:42:12 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jan 2016 18:42:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 13DD618050A for ; Fri, 8 Jan 2016 18:42:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 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.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Qf5gPOG0Wznl for ; Fri, 8 Jan 2016 18:42:11 +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 0BD6C31AD6 for ; Fri, 8 Jan 2016 18:42:03 +0000 (UTC) Received: (qmail 59654 invoked by uid 99); 8 Jan 2016 18:42:03 -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, 08 Jan 2016 18:42:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E810CE049D; Fri, 8 Jan 2016 18:42:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Fri, 08 Jan 2016 18:42:37 -0000 Message-Id: In-Reply-To: <3b40f9de93fe491dba5b915100722380@git.apache.org> References: <3b40f9de93fe491dba5b915100722380@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/47] incubator-geode git commit: GEODE-739: CI failure in LocatorJUnitTest.testNoThreadLeftBehind GEODE-739: CI failure in LocatorJUnitTest.testNoThreadLeftBehind The locator needs to shut down its TCPServer thread if an exception is thrown during startup. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/08262a85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/08262a85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/08262a85 Branch: refs/heads/feature/GEODE-714 Commit: 08262a8544d349482abbc758b44921a3baf92f6b Parents: 3e5ade7 Author: Bruce Schuchardt Authored: Thu Jan 7 09:36:25 2016 -0800 Committer: Bruce Schuchardt Committed: Thu Jan 7 09:36:52 2016 -0800 ---------------------------------------------------------------------- .../gemfire/distributed/internal/InternalLocator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/08262a85/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java index 9d28d1c..50a0fa9 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java @@ -418,7 +418,12 @@ public class InternalLocator extends Locator implements ConnectListener { // } InternalDistributedSystem sys = InternalDistributedSystem.getConnectedInstance(); if (sys != null) { - slocator.startServerLocation(sys); + try { + slocator.startServerLocation(sys); + } catch (RuntimeException e) { + slocator.stop(); + throw e; + } } slocator.endStartLocator(null);