ZOOKEEPER-2413: ContainerManager doesn't close the Timer it creates when stop() is called (Jordan via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1740738 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index ad996c5..edc19ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -299,6 +299,9 @@
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)
diff --git a/src/java/main/org/apache/zookeeper/server/ContainerManager.java b/src/java/main/org/apache/zookeeper/server/ContainerManager.java
index 362e6e4..7eca968 100644
--- a/src/java/main/org/apache/zookeeper/server/ContainerManager.java
+++ b/src/java/main/org/apache/zookeeper/server/ContainerManager.java
@@ -100,6 +100,7 @@
if (timerTask != null) {
timerTask.cancel();
}
+ timer.cancel();
}
/**
