You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2014/01/13 23:34:06 UTC

svn commit: r1557875 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/ZooKeeper.java

Author: phunt
Date: Mon Jan 13 22:34:05 2014
New Revision: 1557875

URL: http://svn.apache.org/r1557875
Log:
ZOOKEEPER-1860. Async versions of reconfig don't actually throw KeeperException nor InterruptedException (Raul Gutierrez Segales via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1557875&r1=1557874&r2=1557875&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Jan 13 22:34:05 2014
@@ -525,6 +525,9 @@ BUGFIXES:
   ZOOKEEPER-1857. PrepRequestProcessotTest doesn't shutdown ZooKeeper server
   (Germán Blanco via michim)
 
+  ZOOKEEPER-1860. Async versions of reconfig don't actually throw
+  KeeperException nor InterruptedException (Raul Gutierrez Segales via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=1557875&r1=1557874&r2=1557875&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Mon Jan 13 22:34:05 2014
@@ -1638,7 +1638,8 @@ public class ZooKeeper {
      * @see #reconfig
      *      
      **/
-    public void reconfig(String joiningServers, String leavingServers, String newMembers, long fromConfig, DataCallback cb, Object ctx) throws KeeperException, InterruptedException
+    public void reconfig(String joiningServers, String leavingServers,
+        String newMembers, long fromConfig, DataCallback cb, Object ctx)
     {
         RequestHeader h = new RequestHeader();
         h.setType(ZooDefs.OpCode.reconfig);       
@@ -1654,7 +1655,9 @@ public class ZooKeeper {
      * @see #reconfig
      *
      */
-    public void reconfig(List<String> joiningServers, List<String> leavingServers, List<String> newMembers, long fromConfig, DataCallback cb, Object ctx) throws KeeperException, InterruptedException
+    public void reconfig(List<String> joiningServers,
+        List<String> leavingServers, List<String> newMembers, long fromConfig,
+        DataCallback cb, Object ctx)
     {
         reconfig(StringUtils.joinStrings(joiningServers, ","), 
         		StringUtils.joinStrings(leavingServers, ","),