This is an automated email from the ASF dual-hosted git repository.

jstewart pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 4e8ee72e38aef93d7eae8aebd9a6a8acf7dc3860
Author: Srikanth Manvi <[email protected]>
AuthorDate: Wed Oct 25 15:26:11 2017 -0400

    GEODE-3843 gfsh shutdown error message suggests non-existent option
---
 .../geode/management/internal/cli/commands/ShutdownCommand.java    | 2 +-
 .../geode/management/internal/cli/GfshParserParsingTest.java       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java
 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java
index c89331a..e6d41b1 100644
--- 
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java
+++ 
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java
@@ -59,7 +59,7 @@ public class ShutdownCommand implements GfshCommand {
   public Result shutdown(
       @CliOption(key = CliStrings.SHUTDOWN__TIMEOUT, unspecifiedDefaultValue = 
DEFAULT_TIME_OUT,
           help = CliStrings.SHUTDOWN__TIMEOUT__HELP) int userSpecifiedTimeout,
-      @CliOption(key = CliStrings.INCLUDE_LOCATORS, unspecifiedDefaultValue = 
"false",
+      @CliOption(key = CliStrings.INCLUDE_LOCATORS, unspecifiedDefaultValue = 
"false", specifiedDefaultValue = "true",
           help = CliStrings.INCLUDE_LOCATORS_HELP) boolean shutdownLocators) {
     try {
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
index 6d18a23..de48b4a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
@@ -360,4 +360,11 @@ public class GfshParserParsingTest {
     assertThat(result.getParamValueAsString("name")).isEqualTo("test");
     assertThat(result.getCommandName()).isEqualTo("start server");
   }
+
+  @Test
+  public void testShutdownWithOptionCommand() throws Exception {
+    String command = "shutdown --include-locators";
+    GfshParseResult result = parser.parse(command);
+    assertThat(result.getParamValue("include-locators")).isEqualTo(true);
+  }
 }

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to