diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 16:42:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 16:45:51 +0100 |
| commit | 5e9a2e9b0f33ab50aa3a84728db75383aede19d9 (patch) | |
| tree | 1f66af867652c4c12ea1c34c0e564caaf5915578 /jvmfwk/inc/vendorplugin.hxx | |
| parent | 0136acb836f3451786c4bd9c34dafe66e30d4dda (diff) | |
Check each potential JRE location only once
i.e., after recent "fdo#83753: consider JAVA_HOME and PATH when selecting JRE"
fix, if jfw_findAndSelectJRE found no suitable JRE in
jfw_plugin_getJavaInfoFromJavaHome or jfw_plugin_getJavaInfosFromPath, do not
re-check those locations in jfw_plugin_getAllJavaInfos.
Change-Id: If4e085b4fceff5b2494c7b7b84ac51691dbc78cc
Diffstat (limited to 'jvmfwk/inc/vendorplugin.hxx')
| -rw-r--r-- | jvmfwk/inc/vendorplugin.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx index 35131df27cef..25d92468e159 100644 --- a/jvmfwk/inc/vendorplugin.hxx +++ b/jvmfwk/inc/vendorplugin.hxx @@ -22,11 +22,13 @@ #define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX #include <jvmfwk/framework.h> +#include <rtl/ref.hxx> #include <rtl/ustring.h> #include "jni.h" #include <vector> #include <utility> #include "../source/elements.hxx" +#include <vendorbase.hxx> /** @file @@ -112,13 +114,15 @@ typedef enum version strings. */ javaPluginError jfw_plugin_getAllJavaInfos( + bool checkJavaHomeAndPath, OUString const& sVendor, OUString const& sMinVersion, OUString const& sMaxVersion, rtl_uString * * arExcludeList, sal_Int32 nSizeExcludeList, JavaInfo*** parJavaInfo, - sal_Int32 *nSizeJavaInfo); + sal_Int32 *nSizeJavaInfo, + std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos); /** obtains information for a JRE at a given location. @@ -202,7 +206,8 @@ javaPluginError jfw_plugin_getJavaInfoByPath( */ javaPluginError jfw_plugin_getJavaInfoFromJavaHome( std::vector<std::pair<OUString, jfw::VersionInfo>> const& vecVendorInfos, - JavaInfo ** ppInfo); + JavaInfo ** ppInfo, + std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos); /** obtains information about installations of Java Runtime Environments (JREs) @@ -244,7 +249,8 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome( javaPluginError jfw_plugin_getJavaInfosFromPath( std::vector<std::pair<OUString, jfw::VersionInfo>> const& vecVendorInfos, - std::vector<JavaInfo*> & vecJavaInfosFromPath); + std::vector<JavaInfo*> & vecJavaInfosFromPath, + std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos); /** starts a Java Virtual Machine. |