GEODE-1994: Removed two references to ServerLauncher.setMemberName that are guaranteed to throw under the changes introduced by d16d192.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/dff937f3 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/dff937f3 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/dff937f3 Branch: refs/heads/feature/GEODE-2632-17 Commit: dff937f32b1cb1cce6269226dc17263484685bf1 Parents: ca12f78 Author: Patrick Rhomberg <prhomb...@pivotal.io> Authored: Tue May 23 15:07:11 2017 -0700 Committer: Jared Stewart <jstew...@pivotal.io> Committed: Wed May 24 09:37:27 2017 -0700 ---------------------------------------------------------------------- .../cli/commands/LauncherLifecycleCommands.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/dff937f3/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java index b6c11c4..74acfd6 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java @@ -1797,12 +1797,12 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { final ServerLauncher serverLauncher = new ServerLauncher.Builder() .setCommand(ServerLauncher.Command.STATUS).setDebug(isDebugging()) // NOTE since we do not know whether the "CacheServer" was enabled or not on the GemFire - // server when it was started, - // set the disableDefaultServer property in the ServerLauncher.Builder to default status + // server when it was started, set the disableDefaultServer property in the + // ServerLauncher.Builder to default status // to the MemberMBean // TODO fix this hack! (how, the 'start server' loop needs it) - .setDisableDefaultServer(true).setMemberName(member).setPid(pid) - .setWorkingDirectory(workingDirectory).build(); + .setDisableDefaultServer(true).setPid(pid).setWorkingDirectory(workingDirectory) + .build(); final ServerState status = serverLauncher.status(); @@ -1854,9 +1854,9 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { .format(CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Cache Server")); } } else { - final ServerLauncher serverLauncher = new ServerLauncher.Builder() - .setCommand(ServerLauncher.Command.STOP).setDebug(isDebugging()).setMemberName(member) - .setPid(pid).setWorkingDirectory(workingDirectory).build(); + final ServerLauncher serverLauncher = + new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STOP) + .setDebug(isDebugging()).setPid(pid).setWorkingDirectory(workingDirectory).build(); serverState = serverLauncher.status(); serverLauncher.stop();
