[GR-31708] Append customJavaArgs after JavaArgs consolidation.

olpaw · olpaw · commit 9ae4f87534ce · 2021-05-31T15:28:03.000Z
PullRequest: graal/9026
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1205,7 +1205,6 @@ private int completeImageBuild() {
                 }
             }
         }
-        addImageBuilderJavaArgs(customJavaArgs.toArray(new String[0]));
         /* Perform JavaArgs consolidation - take the maximum of -Xmx, minimum of -Xms */
         Long xmxValue = consolidateArgs(imageBuilderJavaArgs, oXmx, SubstrateOptionsParser::parseLong, String::valueOf, () -> 0L, Math::max);
         Long xmsValue = consolidateArgs(imageBuilderJavaArgs, oXms, SubstrateOptionsParser::parseLong, String::valueOf, () -> SubstrateOptionsParser.parseLong(getXmsValue()), Math::max);
@@ -1214,6 +1213,7 @@ private int completeImageBuild() {
                 replaceArg(imageBuilderJavaArgs, oXms, Long.toUnsignedString(xmxValue));
             }
         }
+        addImageBuilderJavaArgs(customJavaArgs.toArray(new String[0]));
 
         /* Perform option consolidation of imageBuilderArgs */
 

Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,6 @@ private int completeImageBuild() {`
`1205`	`1205`	`}`
`1206`	`1206`	`}`
`1207`	`1207`	`}`
`1208`		`- addImageBuilderJavaArgs(customJavaArgs.toArray(new String[0]));`
`1209`	`1208`	`/* Perform JavaArgs consolidation - take the maximum of -Xmx, minimum of -Xms */`
`1210`	`1209`	`Long xmxValue = consolidateArgs(imageBuilderJavaArgs, oXmx, SubstrateOptionsParser::parseLong, String::valueOf, () -> 0L, Math::max);`
`1211`	`1210`	`Long xmsValue = consolidateArgs(imageBuilderJavaArgs, oXms, SubstrateOptionsParser::parseLong, String::valueOf, () -> SubstrateOptionsParser.parseLong(getXmsValue()), Math::max);`
`@@ -1214,6 +1213,7 @@ private int completeImageBuild() {`
`1214`	`1213`	`replaceArg(imageBuilderJavaArgs, oXms, Long.toUnsignedString(xmxValue));`
`1215`	`1214`	`}`
`1216`	`1215`	`}`
	`1216`	`+ addImageBuilderJavaArgs(customJavaArgs.toArray(new String[0]));`
`1217`	`1217`
`1218`	`1218`	`/* Perform option consolidation of imageBuilderArgs */`
`1219`	`1219`