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

Merge pull request #7755 from corda/jzadroga/ent-11951/multiple-add-opens

Browse Source 
ENT-11951: Add support for multiple add-opens CLI args to CordaCaplet
This commit is contained in:
Adel El-Beik 2024-06-18 23:22:39 +01:00 committed by GitHub
commit 2d8e68211f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,8 @@ public class CordaCaplet extends Capsule {
private Config nodeConfig = null; private Config nodeConfig = null;
private String baseDir = null; private String baseDir = null;
private final List<String> cmdLineAddOpens = new ArrayList<>();
protected CordaCaplet(Capsule pred) { protected CordaCaplet(Capsule pred) {
super(pred); super(pred);
} }
@ -101,6 +103,7 @@ public class CordaCaplet extends Capsule {
protected ProcessBuilder prelaunch(List<String> jvmArgs, List<String> args) { protected ProcessBuilder prelaunch(List<String> jvmArgs, List<String> args) {
checkJavaVersion(); checkJavaVersion();
nodeConfig = parseConfigFile(args); nodeConfig = parseConfigFile(args);
cmdLineAddOpens.addAll(jvmArgs.stream().filter(arg -> arg.startsWith("--add-opens")).collect(toList()));
return super.prelaunch(jvmArgs, args); return super.prelaunch(jvmArgs, args);
} }
@ -119,7 +122,9 @@ public class CordaCaplet extends Capsule {
@Override @Override
protected int launch(ProcessBuilder pb) throws IOException, InterruptedException { protected int launch(ProcessBuilder pb) throws IOException, InterruptedException {
List<String> args = pb.command(); List<String> args = pb.command();
args.addAll(1, getNodeJvmArgs()); List<String> nodeJvmArgs = getNodeJvmArgs();
nodeJvmArgs.addAll(cmdLineAddOpens);
args.addAll(1, nodeJvmArgs);
pb.command(args); pb.command(args);
return super.launch(pb); return super.launch(pb);
} }
@ -168,6 +173,7 @@ public class CordaCaplet extends Capsule {
boolean defaultOutOfMemoryErrorHandling = true; boolean defaultOutOfMemoryErrorHandling = true;
try { try {
List<String> configJvmArgs = nodeConfig.getStringList("custom.jvmArgs"); List<String> configJvmArgs = nodeConfig.getStringList("custom.jvmArgs");
cmdLineAddOpens.addAll(configJvmArgs.stream().filter(arg -> arg.startsWith("--add-opens")).collect(toList()));
jvmArgs.clear(); jvmArgs.clear();
jvmArgs.addAll(configJvmArgs); jvmArgs.addAll(configJvmArgs);
log(LOG_VERBOSE, "Configured JVM args = " + jvmArgs); log(LOG_VERBOSE, "Configured JVM args = " + jvmArgs);

1
node/capsule/src/main/resources/node-jvm-args.txt
View File

@ -12,6 +12,7 @@
--add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED
--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED