Skip to content

Commit 6e4458f

Browse files
SajeerSajeer
authored andcommitted
Fixed the wrong toolchain honored log
1 parent e709b41 commit 6e4458f

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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);

src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,8 @@ class DevTask extends AbstractFeatureTask {
946946
def launcher = getJavaLauncher();
947947
def scopeString = isTest ? "test " : "";
948948

949-
if (launcher != null && launcher.metadata != null) {
949+
if (launcher != null && launcher.metadata != null
950+
&& !isJavaHomeSetForEnvProperties && !isJavaHomeSetForJvmOptions) {
950951
def metadata = launcher.metadata;
951952
logger.lifecycle(
952953
"Using Java toolchain for dev mode ${scopeString}compilation: " +

0 commit comments

Comments
 (0)