geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstew...@apache.org
Subject geode git commit: GEODE-2966: Restore command changes lost in merge conflict
Date Thu, 01 Jun 2017 16:37:23 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 9046c8dcd -> ad48ab684


GEODE-2966: Restore command changes lost in merge conflict


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ad48ab68
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ad48ab68
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ad48ab68

Branch: refs/heads/develop
Commit: ad48ab684c007b5996a942d12d63c5f405ba03f7
Parents: 9046c8d
Author: Jared Stewart <jstewart@pivotal.io>
Authored: Thu Jun 1 09:36:51 2017 -0700
Committer: Jared Stewart <jstewart@pivotal.io>
Committed: Thu Jun 1 09:36:51 2017 -0700

----------------------------------------------------------------------
 .../internal/cli/commands/lifecycle/StartJConsoleCommand.java    | 4 ++--
 .../internal/cli/commands/lifecycle/StartJVisualVMCommand.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/ad48ab68/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
index e27d78b..0006815 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java
@@ -58,7 +58,7 @@ public class StartJConsoleCommand implements GfshCommand {
           unspecifiedDefaultValue = "false",
           help = CliStrings.START_JCONSOLE__VERSION__HELP) final boolean version,
       @CliOption(key = CliStrings.START_JCONSOLE__J, optionContext = GfshParser.J_OPTION_CONTEXT,
-          help = CliStrings.START_JCONSOLE__J__HELP) final List<String> jvmArgs) {
+          help = CliStrings.START_JCONSOLE__J__HELP) final String[] jvmArgs) {
     try {
       String[] jconsoleCommandLine =
           createJConsoleCommandLine(null, interval, notile, pluginpath, version, jvmArgs);
@@ -113,7 +113,7 @@ public class StartJConsoleCommand implements GfshCommand {
 
   protected String[] createJConsoleCommandLine(final String member, final int interval,
       final boolean notile, final String pluginpath, final boolean version,
-      final List<String> jvmArgs) {
+      final String[] jvmArgs) {
     List<String> commandLine = new ArrayList<>();
 
     commandLine.add(JdkTool.getJConsolePathname());

http://git-wip-us.apache.org/repos/asf/geode/blob/ad48ab68/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
index de6522c..86ed2e6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java
@@ -40,7 +40,7 @@ public class StartJVisualVMCommand implements GfshCommand {
       CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M})
   public Result startJVisualVM(
       @CliOption(key = CliStrings.START_JCONSOLE__J, optionContext = GfshParser.J_OPTION_CONTEXT,
-          help = CliStrings.START_JCONSOLE__J__HELP) final List<String> jvmArgs) {
+          help = CliStrings.START_JCONSOLE__J__HELP) final String[] jvmArgs) {
     try {
       String[] jvisualvmCommandLine = createJVisualVMCommandLine(jvmArgs);
 
@@ -75,7 +75,7 @@ public class StartJVisualVMCommand implements GfshCommand {
     }
   }
 
-  protected String[] createJVisualVMCommandLine(final List<String> jvmArgs) {
+  protected String[] createJVisualVMCommandLine(final String[] jvmArgs) {
     List<String> commandLine = new ArrayList<>();
 
     commandLine.add(JdkTool.getJVisualVMPathname());


Mime
View raw message