@@ -77,6 +77,9 @@ abstract class AbstractServerTask extends AbstractLibertyTask {
7777 protected def server
7878 protected def springBootBuildTask
7979
80+ protected boolean isJavaHomeSetForEnvProperties = false
81+ protected boolean isJavaHomeSetForJvmOptions = false
82+
8083 private enum PropertyType {
8184 BOOTSTRAP (" liberty.server.bootstrapProperties" ),
8285 ENV (" liberty.server.env" ),
@@ -1217,6 +1220,9 @@ abstract class AbstractServerTask extends AbstractLibertyTask {
12171220 */
12181221 @Internal
12191222 protected Map<String , String > getToolchainEnvVar () {
1223+ this . isJavaHomeSetForEnvProperties = isJavaHomeSetForEnvProperties();
1224+ this . isJavaHomeSetForJvmOptions = isJavaHomeSetForJvmOptions();
1225+
12201226 if (! isToolchainConfigured()) {
12211227 logger. debug(" Toolchain is not specified in build context" )
12221228 return Collections . emptyMap();
@@ -1230,7 +1236,7 @@ abstract class AbstractServerTask extends AbstractLibertyTask {
12301236 // run once to make sure project properties are loaded
12311237 loadLibertyConfigFromProperties();
12321238 }
1233- if (! isJavaHomeSetForEnvProperties() && ! isJavaHomeSetForJvmOptions() ) {
1239+ if (! isJavaHomeSetForEnvProperties && ! isJavaHomeSetForJvmOptions) {
12341240 logger. info(" CWWKM4101I: The " + this . path + " task is using the configured toolchain JDK located at " + jdkHome)
12351241 // 3. Apply toolchain configuration
12361242 return populateEnvironmentVariablesMap(jdkHome);
0 commit comments