You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2015/03/14 23:28:07 UTC
svn commit: r1666760 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/ZooKeeperMain.java
Author: michim
Date: Sat Mar 14 22:28:06 2015
New Revision: 1666760
URL: http://svn.apache.org/r1666760
Log:
Revert ZOOKEEPER-2074.
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=1666760&r1=1666759&r2=1666760&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Mar 14 22:28:06 2015
@@ -33,9 +33,6 @@ BUGFIXES:
ZOOKEEPER-1366 Zookeeper should be tolerant of clock adjustments (Hongchao
Deng via michim)
- ZOOKEEPER-2074 Incorrect exit codes for "./zkCli.sh cmd arg" (surendra singh
- lilhore via michim)
-
ZOOKEEPER-1949 recipes jar not included in the distribution package (Rakesh R
via michim)
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=1666760&r1=1666759&r2=1666760&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Sat Mar 14 22:28:06 2015
@@ -273,10 +273,7 @@ public class ZooKeeperMain {
throws KeeperException, IOException, InterruptedException
{
ZooKeeperMain main = new ZooKeeperMain(args);
- boolean result = main.run();
- if (!result) {
- System.exit(1);
- }
+ main.run();
}
public ZooKeeperMain(String args[]) throws IOException, InterruptedException {
@@ -291,7 +288,7 @@ public class ZooKeeperMain {
this.zk = zk;
}
- boolean run() throws KeeperException, IOException, InterruptedException {
+ void run() throws KeeperException, IOException, InterruptedException {
if (cl.getCommand() == null) {
System.out.println("Welcome to ZooKeeper!");
@@ -345,10 +342,9 @@ public class ZooKeeperMain {
executeLine(line);
}
}
- return true;
} else {
// Command line args non-null. Run what was passed.
- return processCmd(cl);
+ processCmd(cl);
}
}