diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-16 09:38:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-16 09:39:16 +0100 |
| commit | 555f024f16d4407be3c9b0dbb15fb18c2f6f3b20 (patch) | |
| tree | 92ecd43e2de5d0f9285f0d158eaa72f499e308a6 /jvmfwk | |
| parent | d54e21eaa2d4baf85484063476d0aa1769b50583 (diff) | |
Related fdo#83753: Fix JVM_ONE_PATH_CHECK feature again
Change-Id: I1dc3b0db6295c43a9d29576b81870b4a293a61aa
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 7b29fafc32c1..7ea4d1b68565 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -817,14 +817,12 @@ vector<Reference<VendorBase> > addAllJREInfos( addJavaInfoFromWinReg(allInfos, addedInfos); #endif // WNT -#ifndef JVM_ONE_PATH_CHECK if (checkJavaHomeAndPath) { addJavaInfoFromJavaHome(allInfos, addedInfos); //this function should be called after addJavaInfosDirScan. //Otherwise in SDKs Java may be started twice addJavaInfosFromPath(allInfos, addedInfos); } -#endif #ifdef UNX addJavaInfosDirScan(allInfos, addedInfos); @@ -1103,6 +1101,7 @@ void addJavaInfosFromPath( std::vector<rtl::Reference<VendorBase>> & allInfos, std::vector<rtl::Reference<VendorBase>> & addedInfos) { +#if !defined JVM_ONE_PATH_CHECK // Get Java from PATH environment variable static const char sCurDir[] = "."; static const char sParentDir[] = ".."; @@ -1147,6 +1146,7 @@ void addJavaInfosFromPath( } while ( nIndex >= 0 ); } +#endif } @@ -1154,6 +1154,7 @@ void addJavaInfoFromJavaHome( std::vector<rtl::Reference<VendorBase>> & allInfos, std::vector<rtl::Reference<VendorBase>> & addedInfos) { +#if !defined JVM_ONE_PATH_CHECK // Get Java from JAVA_HOME environment // Note that on OS X is it not normal at all to have a JAVA_HOME environment @@ -1170,6 +1171,7 @@ void addJavaInfoFromJavaHome( getAndAddJREInfoByPath(sHomeUrl, allInfos, addedInfos); } } +#endif } bool makeDriveLetterSame(OUString * fileURL) |