ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-31 00:24:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

EG-466 - Fix bug: (#5999)

Browse Source 
'shutdown' command is repeated twice in the list of available shell commands.
This commit is contained in:
pnemeth 2020-02-28 12:16:53 +00:00 committed by GitHub
parent 1bf311ce4f
commit d037dc0d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
View File

@ -1,6 +1,5 @@
package net.corda.tools.shell; package net.corda.tools.shell;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.corda.client.jackson.StringToMethodCallParser; import net.corda.client.jackson.StringToMethodCallParser;
import net.corda.core.messaging.CordaRPCOps; import net.corda.core.messaging.CordaRPCOps;
@ -13,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.AbstractMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -56,6 +56,9 @@ public class RunShellCommand extends InteractiveShellCommand {
// Each element we emit is a map of column -> content. // Each element we emit is a map of column -> content.
Set<Map.Entry<String, String>> entries = cordaRpcOpsParser.getAvailableCommands().entrySet(); Set<Map.Entry<String, String>> entries = cordaRpcOpsParser.getAvailableCommands().entrySet();
List<Map.Entry<String, String>> entryList = new ArrayList<>(entries); List<Map.Entry<String, String>> entryList = new ArrayList<>(entries);
entryList.add(new AbstractMap.SimpleEntry<>("gracefulShutdown", ""));//Shell only command
entryList.sort(comparing(Map.Entry::getKey)); entryList.sort(comparing(Map.Entry::getKey));
for (Map.Entry<String, String> entry : entryList) { for (Map.Entry<String, String> entry : entryList) {
// Skip these entries as they aren't really interesting for the user. // Skip these entries as they aren't really interesting for the user.
@ -68,17 +71,6 @@ public class RunShellCommand extends InteractiveShellCommand {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
Lists.newArrayList(
commandAndDesc("shutdown", "Shuts node down (immediately)"),
commandAndDesc("gracefulShutdown", "Shuts node down gracefully, waiting for all flows to complete first.")
).forEach(stringStringMap -> {
try {
context.provide(stringStringMap);
} catch (Exception e) {
throw new RuntimeException(e);
}
});
} }
@NotNull @NotNull