Return-Path: X-Original-To: apmail-helix-commits-archive@minotaur.apache.org Delivered-To: apmail-helix-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 3427FF076 for ; Wed, 1 May 2013 21:26:29 +0000 (UTC) Received: (qmail 74994 invoked by uid 500); 1 May 2013 21:26:29 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 74949 invoked by uid 500); 1 May 2013 21:26:28 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 74935 invoked by uid 99); 1 May 2013 21:26:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 21:26:28 +0000 X-ASF-Spam-Status: No, hits=-2002.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 May 2013 21:26:27 +0000 Received: (qmail 73783 invoked by uid 99); 1 May 2013 21:26:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 21:26:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EFA7F8854BE; Wed, 1 May 2013 21:26:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zzhang@apache.org To: commits@helix.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix listener leaking on session expiry Date: Wed, 1 May 2013 21:26:06 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 0bc258cfe -> d5289aebc fix listener leaking on session expiry Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/d5289aeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/d5289aeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/d5289aeb Branch: refs/heads/master Commit: d5289aebc0a386b82b2d23797ce7b47b90e84fdc Parents: 0bc258c Author: zzhang Authored: Wed May 1 14:26:00 2013 -0700 Committer: zzhang Committed: Wed May 1 14:26:00 2013 -0700 ---------------------------------------------------------------------- .../apache/helix/manager/zk/ZKHelixManager.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/d5289aeb/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java index a944c35..4095796 100644 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java @@ -251,8 +251,6 @@ public class ZKHelixManager implements HelixManager checkConnected(); PropertyType type = propertyKey.getType(); - CallbackHandler newHandler = - createCallBackHandler(propertyKey, listener, eventType, changeType); synchronized (this) { @@ -265,7 +263,9 @@ public class ZKHelixManager implements HelixManager return; } } - + + CallbackHandler newHandler = + createCallBackHandler(propertyKey, listener, eventType, changeType); _handlers.add(newHandler); logger.info("Add listener: " + listener + " for type: " + type + " to path: " + newHandler.getPath()); }