Explorar o código

ZOOKEEPER-1672. zookeeper client does not accept "-members" option in reconfig command (Xiaoshuang Wang via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1458648 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt %!s(int64=12) %!d(string=hai) anos
pai
achega
0312b95b80
Modificáronse 2 ficheiros con 4 adicións e 1 borrados
  1. 3 0
      CHANGES.txt
  2. 1 1
      src/java/main/org/apache/zookeeper/cli/ReconfigCommand.java

+ 3 - 0
CHANGES.txt

@@ -339,6 +339,9 @@ BUGFIXES:
   ZOOKEEPER-1647. OSGi package import/export changes not applied to
   bin-jar (Arnoud Glimmerveen via phunt)
 
+  ZOOKEEPER-1672. zookeeper client does not accept "-members" option
+  in reconfig command (Xiaoshuang Wang via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

+ 1 - 1
src/java/main/org/apache/zookeeper/cli/ReconfigCommand.java

@@ -85,7 +85,7 @@ public class ReconfigCommand extends CliCommand {
         members = null;
         Parser parser = new PosixParser();
         cl = parser.parse(options, cmdArgs);
-        if (!cl.hasOption("file") && !cl.hasOption("add") && !cl.hasOption("remove")) {
+        if (!(cl.hasOption("file") || cl.hasOption("members")) && !cl.hasOption("add") && !cl.hasOption("remove")) {
             throw new ParseException(getUsageStr());
         }
         if (cl.hasOption("v")) {