zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f..@apache.org
Subject svn commit: r1740737 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/main/org/apache/zookeeper/server/ContainerManager.java
Date Sun, 24 Apr 2016 21:19:56 GMT
Author: fpj
Date: Sun Apr 24 21:19:55 2016
New Revision: 1740737

URL: http://svn.apache.org/viewvc?rev=1740737&view=rev
Log:
ZOOKEEPER-2413: ContainerManager doesn't close the Timer it creates when stop() is called
(Jordan via fpj)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/ContainerManager.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1740737&r1=1740736&r2=1740737&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun Apr 24 21:19:55 2016
@@ -145,7 +145,10 @@ BUGFIXES:
   ZOOKEEPER-2364: "ant docs" fails on branch-3.5 due to missing releasenotes.xml.
   (phunt via cnauroth)
   
-  ZOOKEEPER-2141 ACL cache in DataTree never removes entries (Adam Milne-Smith via camille)
+  ZOOKEEPER-2141: ACL cache in DataTree never removes entries (Adam Milne-Smith via camille)
+
+  ZOOKEEPER-2413: ContainerManager doesn't close the Timer it
+  creates when stop() is called (Jordan via fpj) 
 
 IMPROVEMENTS:
 

Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/ContainerManager.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/ContainerManager.java?rev=1740737&r1=1740736&r2=1740737&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/ContainerManager.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/ContainerManager.java
Sun Apr 24 21:19:55 2016
@@ -100,6 +100,7 @@ public class ContainerManager {
         if (timerTask != null) {
             timerTask.cancel();
         }
+        timer.cancel();
     }
 
     /**



Mime
View raw message