You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by th...@apache.org on 2013/11/14 05:43:46 UTC

svn commit: r1541814 - /zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java

Author: thawan
Date: Thu Nov 14 04:43:46 2013
New Revision: 1541814

URL: http://svn.apache.org/r1541814
Log:
ZOOKEEPER-1798. Fix race condition in testNormalObserverRun (Part 2) (thawan, fpj via thawan)

Modified:
    zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java

Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java?rev=1541814&r1=1541813&r2=1541814&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java Thu Nov 14 04:43:46 2013
@@ -136,4 +136,12 @@ public class ObserverZooKeeperServer ext
     public String getState() {
         return "observer";
     };    
+
+    @Override
+    public void shutdown() {
+        super.shutdown();
+        if (syncRequestProcessorEnabled && syncProcessor != null) {
+            syncProcessor.shutdown();
+        }
+    }
 }