ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 05:53:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6584 from filipesoliveira/filipeoliveira/corda-3931

Browse Source 
CORDA-3931 - Fixed a bug which was preventing the custom JVM arguments from  being picked up when the command line "-f" flag was used
This commit is contained in:
Anurag Garg 2020-08-13 14:13:09 +01:00 committed by GitHub
commit 294c2aa514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +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 = getOption(args, "--config-file");
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);