mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[platform] quick fix to make IDE start on Java 8 on Windows (IDEA-237332)
GitOrigin-RevId: 58f7a64a4e9ce75b3658dd5b5a4d824ae1f2ea0e
This commit is contained in:
committed by
intellij-monorepo-bot
parent
fd23f83eb5
commit
fdd879c02e
Binary file not shown.
Binary file not shown.
@@ -31,9 +31,6 @@ JNIEnv* env = NULL;
|
||||
volatile bool terminating = false;
|
||||
volatile int hookExitCode = 0;
|
||||
|
||||
//tools.jar doesn't exist in jdk 9 and later. So check it for jdk 1.8 only.
|
||||
bool toolsArchiveExists = false;
|
||||
|
||||
HANDLE hFileMapping;
|
||||
HANDLE hEvent;
|
||||
HANDLE hSingleInstanceWatcherThread;
|
||||
@@ -233,7 +230,6 @@ bool FindJVMInRegistry()
|
||||
{
|
||||
#ifndef _M_X64
|
||||
if (FindJVMInRegistryWithVersion("1.8", true))
|
||||
toolsArchiveExists = true;
|
||||
return true;
|
||||
if (FindJVMInRegistryWithVersion("9", true))
|
||||
return true;
|
||||
@@ -242,7 +238,6 @@ bool FindJVMInRegistry()
|
||||
#endif
|
||||
|
||||
if (FindJVMInRegistryWithVersion("1.8", false))
|
||||
toolsArchiveExists = true;
|
||||
return true;
|
||||
if (FindJVMInRegistryWithVersion("9", false))
|
||||
return true;
|
||||
@@ -421,7 +416,7 @@ std::string BuildClassPath()
|
||||
std::string classpathLibs = LoadStdString(IDS_CLASSPATH_LIBS);
|
||||
std::string result = CollectLibJars(classpathLibs);
|
||||
|
||||
if (toolsArchiveExists)
|
||||
if (LoadStdString(IDS_JDK_ONLY) == std::string("true"))
|
||||
{
|
||||
std::string toolsJar = FindToolsJar();
|
||||
if (toolsJar.size() > 0)
|
||||
|
||||
Reference in New Issue
Block a user