[GitHub] geertjanw closed pull request #433: [NETBEANS-417] Adjust C file to handle new registry layout starting with jdk9

[GitBox <gi...@apache.org>]

geertjanw closed pull request #433: [NETBEANS-417] Adjust C file to handle new registry layout starting with jdk9 
URL: https://github.com/apache/incubator-netbeans/pull/433
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
index f85acb1b6..ffb8c51e0 100644
--- a/ide/launcher/windows/nblauncher.cpp
+++ b/ide/launcher/windows/nblauncher.cpp
@@ -401,7 +401,7 @@ bool NbLauncher::findCacheDir(const char *str) {
 string NbLauncher::getDefaultUserDirRoot() {
     TCHAR defUserDirRootChar[MAX_PATH];
     if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, defUserDirRootChar))) {
-        return false;
+        return std::string();
     }
     defUserDirRoot = ((string) defUserDirRootChar) + NETBEANS_DIRECTORY;
     defUserDirRoot.erase(defUserDirRoot.rfind('\\'));
@@ -412,7 +412,7 @@ string NbLauncher::getDefaultUserDirRoot() {
 string NbLauncher::getDefaultCacheDirRoot() {
     TCHAR defCacheDirRootChar[MAX_PATH];
     if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, defCacheDirRootChar))) {
-        return false;
+        return std::string();
     }
     defCacheDirRoot = ((string) defCacheDirRootChar) + NETBEANS_CACHES_DIRECTORY;
     defCacheDirRoot.erase(defCacheDirRoot.rfind('\\'));
diff --git a/o.n.bootstrap/launcher/windows/jvmlauncher.cpp b/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
index a292773ac..7e297f18a 100644
--- a/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
+++ b/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
@@ -28,6 +28,8 @@ using namespace std;
 
 const char *JvmLauncher::JDK_KEY = "Software\\JavaSoft\\Java Development Kit";
 const char *JvmLauncher::JRE_KEY = "Software\\JavaSoft\\Java Runtime Environment";
+const char *JvmLauncher::JDK_POST9_KEY = "Software\\JavaSoft\\JDK";
+const char *JvmLauncher::JRE_POST9_KEY = "Software\\JavaSoft\\JRE";
 const char *JvmLauncher::CUR_VERSION_NAME = "CurrentVersion";
 const char *JvmLauncher::JAVA_HOME_NAME = "JavaHome";
 const char *JvmLauncher::JAVA_BIN_DIR = "\\bin";
@@ -399,6 +401,13 @@ bool JvmLauncher::startOutProcJvm(const char *mainClassName, const std::list<std
 }
 
 bool JvmLauncher::findJava(const char *minJavaVersion) {
+    // scan for registry for jdk/jre version 9
+    if (findJava(JDK_POST9_KEY, "", minJavaVersion)) {
+        return true;
+    }
+    if (findJava(JRE_POST9_KEY, "", minJavaVersion)) {
+        return true;
+    }
     if (findJava(JDK_KEY, JAVA_JRE_PREFIX, minJavaVersion)) {
         return true;
     }
diff --git a/o.n.bootstrap/launcher/windows/jvmlauncher.h b/o.n.bootstrap/launcher/windows/jvmlauncher.h
index b550c62ca..01f4e3448 100644
--- a/o.n.bootstrap/launcher/windows/jvmlauncher.h
+++ b/o.n.bootstrap/launcher/windows/jvmlauncher.h
@@ -34,6 +34,9 @@ class JvmLauncher {
 
     static const char *JDK_KEY;
     static const char *JRE_KEY;
+    // registry key change starting with version 9 
+    static const char *JDK_POST9_KEY;
+    static const char *JRE_POST9_KEY;
     static const char *CUR_VERSION_NAME;
     static const char *JAVA_HOME_NAME;
     static const char *JAVA_BIN_DIR;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists