From bd4abaa8bffc0ebd25a892c8962896d29ad0ab2c Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 30 Mar 2018 20:59:00 +0300
Subject: [PATCH] Improve JDK discovery for JDK9+ on Windows

---
 buildSrc/src/main/kotlin/jdksFinder.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/jdksFinder.kt b/buildSrc/src/main/kotlin/jdksFinder.kt
index 3b1812185c0..e1336220f10 100644
--- a/buildSrc/src/main/kotlin/jdksFinder.kt
+++ b/buildSrc/src/main/kotlin/jdksFinder.kt
@@ -149,7 +149,9 @@ fun MutableCollection<JdkId>.discoverJdksOnUnix(project: Project) {
 
 private val windowsConventionalJdkRegistryPaths = listOf(
         "SOFTWARE\\JavaSoft\\Java Development Kit",
-        "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Development Kit")
+        "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Development Kit",
+        "SOFTWARE\\JavaSoft\\JDK",
+        "SOFTWARE\\Wow6432Node\\JavaSoft\\JDK")
 
 fun MutableCollection<JdkId>.discoverJdksOnWindows(project: Project) {
     val registry = Native.get(WindowsRegistry::class.java)