Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B4E7181EE for ; Sun, 24 Apr 2016 21:21:37 +0000 (UTC) Received: (qmail 52602 invoked by uid 500); 24 Apr 2016 21:21:37 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 52563 invoked by uid 500); 24 Apr 2016 21:21:37 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 52552 invoked by uid 99); 24 Apr 2016 21:21:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Apr 2016 21:21:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 50A9A1A030E for ; Sun, 24 Apr 2016 21:21:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id DybMJ9AdQ6nA for ; Sun, 24 Apr 2016 21:21:35 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 3CE695F54F for ; Sun, 24 Apr 2016 21:21:35 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 437E9E0316 for ; Sun, 24 Apr 2016 21:21:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 39CCF3A05E6 for ; Sun, 24 Apr 2016 21:21:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1740738 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/ContainerManager.java Date: Sun, 24 Apr 2016 21:21:34 -0000 To: commits@zookeeper.apache.org From: fpj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160424212134.39CCF3A05E6@svn01-us-west.apache.org> Author: fpj Date: Sun Apr 24 21:21:34 2016 New Revision: 1740738 URL: http://svn.apache.org/viewvc?rev=1740738&view=rev Log: ZOOKEEPER-2413: ContainerManager doesn't close the Timer it creates when stop() is called (Jordan via fpj) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ContainerManager.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1740738&r1=1740737&r2=1740738&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Sun Apr 24 21:21:34 2016 @@ -299,6 +299,9 @@ BUGFIXES: ZOOKEEPER-2364: "ant docs" fails on branch-3.5 due to missing releasenotes.xml. (phunt via cnauroth) + ZOOKEEPER-2413: ContainerManager doesn't close the Timer it + creates when stop() is called (Jordan via fpj) + IMPROVEMENTS: ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex) Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ContainerManager.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ContainerManager.java?rev=1740738&r1=1740737&r2=1740738&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ContainerManager.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ContainerManager.java Sun Apr 24 21:21:34 2016 @@ -100,6 +100,7 @@ public class ContainerManager { if (timerTask != null) { timerTask.cancel(); } + timer.cancel(); } /**