You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2012/12/31 02:44:18 UTC

svn commit: r1427035 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/ZooKeeperMain.java

Author: camille
Date: Mon Dec 31 01:44:18 2012
New Revision: 1427035

URL: http://svn.apache.org/viewvc?rev=1427035&view=rev
Log:
ZOOKEEPER-1535. ZK Shell/Cli re-executes last command on exit (Edward Ribeiro via camille)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1427035&r1=1427034&r2=1427035&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Dec 31 01:44:18 2012
@@ -32,6 +32,9 @@ BUGFIXES:
 
   ZOOKEEPER-1334. Zookeeper 3.4.x is not OSGi compliant - MANIFEST.MF
   is flawed (Claus Ibsen via phunt)
+  
+  ZOOKEEPER-1535. ZK Shell/Cli re-executes last command on exit 
+  (Edward Ribeiro via camille)
 
 IMPROVEMENTS:
 

Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1427035&r1=1427034&r2=1427035&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Mon Dec 31 01:44:18 2012
@@ -350,11 +350,6 @@ public class ZooKeeperMain {
                 }
             }
         }
-
-        boolean watch = processCmd(cl);
-        if (!watch) {
-            System.exit(0);
-        }
     }
 
     public void executeLine(String line)