Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3E432200B74 for ; Thu, 28 Jul 2016 02:51:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B86E160A93; Thu, 28 Jul 2016 00:51:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A04A160AA8 for ; Thu, 28 Jul 2016 02:51:51 +0200 (CEST) Received: (qmail 75440 invoked by uid 500); 28 Jul 2016 00:51:50 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 75385 invoked by uid 99); 28 Jul 2016 00:51:50 -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, 28 Jul 2016 00:51:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87008E04BE; Thu, 28 Jul 2016 00:51:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Thu, 28 Jul 2016 00:51:52 -0000 Message-Id: <5a3aebe135af444c90325d9573492101@git.apache.org> In-Reply-To: <74438f9761f64e9f8cdcc8bb7320bb14@git.apache.org> References: <74438f9761f64e9f8cdcc8bb7320bb14@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] curator git commit: Merge branch 'master' into CURATOR-3.0 archived-at: Thu, 28 Jul 2016 00:51:52 -0000 Merge branch 'master' into CURATOR-3.0 Conflicts: curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ff169d6e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ff169d6e Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ff169d6e Branch: refs/heads/CURATOR-3.0 Commit: ff169d6e8da4740c254fb18a742f90ab012c3b4b Parents: 25ddaeb 6cebfc1 Author: Cam McKenzie Authored: Thu Jul 28 10:51:07 2016 +1000 Committer: Cam McKenzie Committed: Thu Jul 28 10:51:07 2016 +1000 ---------------------------------------------------------------------- .../framework/recipes/cache/TreeCache.java | 34 ++++++-------------- .../recipes/leader/LeaderSelector.java | 21 ++++++------ 2 files changed, 21 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/ff169d6e/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java ---------------------------------------------------------------------- diff --cc curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java index a69a810,906d23d..95b173e --- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java +++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/TreeCache.java @@@ -609,10 -586,9 +593,10 @@@ public class TreeCache implements Close { if ( treeState.compareAndSet(TreeState.STARTED, TreeState.CLOSED) ) { + client.removeWatchers(); client.getConnectionStateListenable().removeListener(connectionStateListener); listeners.clear(); - executorService.close(); + executorService.shutdown(); try { root.wasDeleted();