zookeeper-commits mailing list archives

Author: michim
Date: Thu Apr  3 22:39:16 2014
New Revision: 1584438

URL: http://svn.apache.org/r1584438
Log:
ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)

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

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1584438&r1=1584437&r2=1584438&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Apr  3 22:39:16 2014
@@ -596,6 +596,8 @@ BUGFIXES:
   ZOOKEEPER-1906. zkpython: invalid data in GetData for empty node
   (Nikita Vetoshkin via michim)
 
+  ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1584438&r1=1584437&r2=1584438&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Thu Apr  3 22:39:16
2014
@@ -340,6 +340,9 @@ public class ZooKeeperMain {
                     executeLine(line);
                 }
             }
+        } else {
+            // Command line args non-null.  Run what was passed.
+            processCmd(cl);
         }
     }