svn commit: r1718122 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/main/org/apache/zookeeper/ClientCnxn.java src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java

[rgs]

Author: rgs
Date: Sat Dec  5 21:33:40 2015
New Revision: 1718122

URL: http://svn.apache.org/viewvc?rev=1718122&view=rev
Log:
ZOOKEEPER-2330: ZooKeeper close API does not close Login thread
(Arshad Mohammad via rgs)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
    
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1718122&r1=1718121&r2=1718122&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Dec  5 21:33:40 2015
@@ -65,6 +65,9 @@ BUGFIXES:
   ZOOKEEPER-2329: Clear javac and javadoc warning from zookeeper
   (Arshad Mohammad via rgs)
 
+  ZOOKEEPER-2330: ZooKeeper close API does not close Login thread
+  (Arshad Mohammad via rgs)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1718122&r1=1718121&r2=1718122&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
 Sat Dec  5 21:33:40 2015
@@ -1464,6 +1464,9 @@ public class ClientCnxn {
 
         sendThread.close();
         eventThread.queueEventOfDeath();
+        if (null != zooKeeperSaslClient) {
+            zooKeeperSaslClient.shutdown();
+        }
     }
 
     /**

Modified: 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java?rev=1718122&r1=1718121&r2=1718122&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
 Sat Dec  5 21:33:40 2015
@@ -580,5 +580,12 @@ public class ZooKeeperSaslClient {
         }
     }
 
-
+    /**
+     * close login thread if running
+     */
+    public void shutdown() {
+        if (null != login) {
+            login.shutdown();
+        }
+    }
 }