diff options
author | Alexander Kurtakov | 2016-09-28 17:02:33 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-09-30 07:00:29 +0000 |
commit | c6e7babcafcd6809fb78f61fb32b0d6ef95362da (patch) | |
tree | 8c2e9e1b7e75739c93fa6d24ae3a92242b091b32 /features | |
parent | 61d4d356b63091bb27ea0c7be0a6daaf06b74c28 (diff) | |
download | rt.equinox.framework-c6e7babcafcd6809fb78f61fb32b0d6ef95362da.tar.gz rt.equinox.framework-c6e7babcafcd6809fb78f61fb32b0d6ef95362da.tar.xz rt.equinox.framework-c6e7babcafcd6809fb78f61fb32b0d6ef95362da.zip |
Bug 498758 - Move launcher to Java 6
Checking windows registry should happen for Java 1.6+.
Change-Id: I8ec63314fe450a951e86e5870d7d2191c577c313
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'features')
-rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c b/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c index 9fdcea04c..4df9e99dd 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c +++ b/features/org.eclipse.equinox.executable.feature/library/win32/eclipseWin.c @@ -410,7 +410,7 @@ static _TCHAR* findLib( _TCHAR* command ) { free(location); } - /* Not found yet, try the registry, we will use the first vm >= 1.4 */ + /* Not found yet, try the registry, we will use the first vm >= 1.6 */ jreKeyName = _T("Software\\JavaSoft\\Java Runtime Environment"); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, jreKeyName, 0, KEY_READ, &jreKey) == ERROR_SUCCESS) { if(RegQueryValueEx(jreKey, _T_ECLIPSE("CurrentVersion"), NULL, NULL, (void*)&keyName, &length) == ERROR_SUCCESS) { @@ -423,8 +423,8 @@ static _TCHAR* findLib( _TCHAR* command ) { j = 0; length = MAX_PATH; while (RegEnumKeyEx(jreKey, j++, keyName, &length, 0, 0, 0, 0) == ERROR_SUCCESS) { - /*look for a 1.4 or 1.5 vm*/ - if( _tcsncmp(_T("1.4"), keyName, 3) <= 0 ) { + /*look for a 1.6+ vm*/ + if( _tcsncmp(_T("1.6"), keyName, 3) <= 0 ) { path = checkVMRegistryKey(jreKey, keyName); if (path != NULL) { RegCloseKey(jreKey); |