From 36ff5908991fce1db8f61f4ccc61289360c424b1 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Wed, 29 Aug 2018 16:13:38 +0300
Subject: [PATCH] Gradle: allow to use bundled JDK for gradle tooling

---
 .../gradle/service/project/GradleProjectOpenProcessor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectOpenProcessor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectOpenProcessor.java
index ca091d662efa..fdc7f0c66112 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectOpenProcessor.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectOpenProcessor.java
@@ -285,7 +285,8 @@ public class GradleProjectOpenProcessor extends ProjectOpenProcessor {
 
   private static boolean setupGradleJvm(@Nullable Project project, @NotNull GradleProjectSettings projectSettings) {
     final Pair<String, Sdk> sdkPair = ExternalSystemJdkUtil.getAvailableJdk(project);
-    if (!ExternalSystemJdkUtil.USE_INTERNAL_JAVA.equals(sdkPair.first)) {
+    if (!ExternalSystemJdkUtil.USE_INTERNAL_JAVA.equals(sdkPair.first) ||
+        ExternalSystemJdkUtil.isValidJdk(sdkPair.second.getHomePath())) {
       projectSettings.setGradleJvm(sdkPair.first);
       return true;
     }