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 2016/08/10 17:32:31 UTC
svn commit: r1755787 - in /zookeeper/branches/branch-3.5: CHANGES.txt
src/java/main/org/apache/zookeeper/cli/CliException.java
src/java/test/org/apache/zookeeper/ZooKeeperTest.java
Author: phunt
Date: Wed Aug 10 17:32:31 2016
New Revision: 1755787
URL: http://svn.apache.org/viewvc?rev=1755787&view=rev
Log:
ZOOKEEPER-2074: Incorrect exit codes for './zkCli.sh cmd arg' (Abraham Fine via phunt)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/cli/CliException.java
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/ZooKeeperTest.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1755787&r1=1755786&r2=1755787&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Wed Aug 10 17:32:31 2016
@@ -17,6 +17,9 @@ BUGFIXES:
ZOOKEEPER-2500: Fix compilation warnings for CliException classes
(Abraham Fine via phunt)
+ ZOOKEEPER-2074: Incorrect exit codes for "./zkCli.sh cmd arg"
+ (Abraham Fine via phunt)
+
IMPROVEMENTS:
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/cli/CliException.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/cli/CliException.java?rev=1755787&r1=1755786&r2=1755787&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/cli/CliException.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/cli/CliException.java Wed Aug 10 17:32:31 2016
@@ -22,8 +22,10 @@ public class CliException extends Except
protected int exitCode;
+ protected static final int DEFAULT_EXCEPTION_EXIT_CODE = 1;
+
public CliException(String message) {
- this(message, 1);
+ this(message, DEFAULT_EXCEPTION_EXIT_CODE);
}
public CliException(String message, int exitCode) {
@@ -32,7 +34,7 @@ public class CliException extends Except
}
public CliException(Throwable cause) {
- this(cause, 1);
+ this(cause, DEFAULT_EXCEPTION_EXIT_CODE);
}
public CliException(Throwable cause, int exitCode) {
@@ -41,7 +43,7 @@ public class CliException extends Except
}
public CliException(String message, Throwable cause) {
- super(message, cause);
+ this(message, cause, DEFAULT_EXCEPTION_EXIT_CODE);
}
public CliException(String message, Throwable cause, int exitCode) {
Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/ZooKeeperTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/ZooKeeperTest.java?rev=1755787&r1=1755786&r2=1755787&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/ZooKeeperTest.java (original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/ZooKeeperTest.java Wed Aug 10 17:32:31 2016
@@ -336,6 +336,11 @@ public class ZooKeeperTest extends Clien
}
@Test
+ public void testDeleteNonexistantNode() throws Exception {
+ testInvalidCommand("delete /blahblahblah", 1);
+ }
+
+ @Test
public void testStatCommand() throws Exception {
final ZooKeeper zk = createClient();
ZooKeeperMain zkMain = new ZooKeeperMain(zk);