From 2fee407cf390b4808ef6348d644dcaec3e8f37cc Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Thu, 28 Mar 2024 18:50:59 +0100 Subject: [PATCH] IDEA-329792 [Gradle|Sync] fix: returned old filed for the migration of the java toolchain home Source set is serialized with the data nodes storage. So we need to migrate old data. GitOrigin-RevId: 0512049a8436225e8e7e8602ae6862710144de89 --- .../plugins/gradle/model/DefaultExternalSourceSet.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java index 5258dbdcc893..058822a0a273 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java @@ -19,6 +19,9 @@ public final class DefaultExternalSourceSet implements ExternalSourceSet { private boolean isPreview; private String sourceCompatibility; private String targetCompatibility; + // The jdkInstallationPath exists only for migration. + // Source sets are serialized with the project data nodes. + private String jdkInstallationPath; private File javaToolchainHome; private Collection artifacts; private @NotNull Collection dependencies; @@ -80,10 +83,15 @@ public final class DefaultExternalSourceSet implements ExternalSourceSet { @Override public @Nullable File getJavaToolchainHome() { + if (jdkInstallationPath != null) { + javaToolchainHome = new File(jdkInstallationPath); + jdkInstallationPath = null; + } return javaToolchainHome; } public void setJavaToolchainHome(@Nullable File javaToolchainHome) { + this.jdkInstallationPath = null; this.javaToolchainHome = javaToolchainHome; }