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();
}
/**
