You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by nk...@apache.org on 2020/03/26 17:46:12 UTC
[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3760: remove a
useless throwing CliException
This is an automated email from the ASF dual-hosted git repository.
nkalmar pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new 891d81d ZOOKEEPER-3760: remove a useless throwing CliException
891d81d is described below
commit 891d81d66fe93382376df2e417b41255f0bc3dac
Author: lingjinjiang <li...@gmail.com>
AuthorDate: Thu Mar 26 18:41:57 2020 +0100
ZOOKEEPER-3760: remove a useless throwing CliException
https://issues.apache.org/jira/browse/ZOOKEEPER-3760
When I upgrade zookeeper from 3.4.13 to 3.5.7 in my application, I find the function processCmd in ZooKeeperMain.java throws a CliException which has been caught in the function. So I think it can be removed
Author: lingjinjiang <li...@gmail.com>
Reviewers: Enrico Olivelli <eo...@apache.org>, Norbert Kalmar <nk...@apache.org>
Closes #1286 from lingjinjiang/master
(cherry picked from commit 2581f71dd97cfda2cf6768c3457b81c7a93b9ef7)
Signed-off-by: Norbert Kalmar <nk...@apache.org>
---
.../src/main/java/org/apache/zookeeper/ZooKeeperMain.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
index dad878c..8d8a419 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
@@ -289,7 +289,7 @@ public class ZooKeeperMain {
zk = new ZooKeeperAdmin(host, Integer.parseInt(cl.getOption("timeout")), new MyWatcher(), readOnly);
}
- public static void main(String[] args) throws CliException, IOException, InterruptedException {
+ public static void main(String[] args) throws IOException, InterruptedException {
ZooKeeperMain main = new ZooKeeperMain(args);
main.run();
}
@@ -304,7 +304,7 @@ public class ZooKeeperMain {
this.zk = zk;
}
- void run() throws CliException, IOException, InterruptedException {
+ void run() throws IOException, InterruptedException {
if (cl.getCommand() == null) {
System.out.println("Welcome to ZooKeeper!");
@@ -353,7 +353,7 @@ public class ZooKeeperMain {
ServiceUtils.requestSystemExit(exitCode);
}
- public void executeLine(String line) throws CliException, InterruptedException, IOException {
+ public void executeLine(String line) throws InterruptedException, IOException {
if (!line.equals("")) {
cl.parseCommand(line);
addToHistory(commandCount, line);
@@ -362,7 +362,7 @@ public class ZooKeeperMain {
}
}
- protected boolean processCmd(MyCommandOptions co) throws CliException, IOException, InterruptedException {
+ protected boolean processCmd(MyCommandOptions co) throws IOException, InterruptedException {
boolean watch = false;
try {
watch = processZKCmd(co);