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

Refactored the previous bug fix to minimize duplication by reusing an existing function.

Browse Source 
Bear in mind that the condition in the previous code was (config == null) and now is (config == null || config.equals("")).
This commit is contained in:
filipesoliveira 2020-08-06 11:15:19 +01:00
parent 80d279a70e
commit 8eaf237a27
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/capsule/src/main/java/CordaCaplet.java
View File

@ -33,9 +33,8 @@ public class CordaCaplet extends Capsule {
private Config parseConfigFile(List<String> args) { private Config parseConfigFile(List<String> args) {
this.baseDir = getBaseDirectory(args); this.baseDir = getBaseDirectory(args);
String config = getOptionMultiple(args, Arrays.asList("--config-file", "-f"));
File configFile = (config == null) ? new File(baseDir, "node.conf") : new File(config); File configFile = getConfigFile(args, baseDir);
try { try {
ConfigParseOptions parseOptions = ConfigParseOptions.defaults().setAllowMissing(false); ConfigParseOptions parseOptions = ConfigParseOptions.defaults().setAllowMissing(false);
Config defaultConfig = ConfigFactory.parseResources("corda-reference.conf", parseOptions); Config defaultConfig = ConfigFactory.parseResources("corda-reference.conf", parseOptions);