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; }