mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS jl13 (1.14.10); FILE MERGED

Browse Source 
2004/09/30 08:34:38 jl 1.14.10.2: #i29390#
2004/09/20 10:08:52 jl 1.14.10.1: #i34388# an JRE whith an unknown version, such as 1.4.2_06-ea, caused that no JREs were displayed in the options dialog
This commit is contained in:
Jens-Heiner Rechtien
2004-11-09 12:59:04 +00:00
parent c4b656e9f8
commit 5bcb4eb48b
1 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: sunjavaplugin.cxx,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: hr $ $Date: 2004-07-23 11:51:38 $
* last change: $Author: hr $ $Date: 2004-11-09 13:59:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -298,7 +298,18 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
if (sTheMinVersion.getLength() > 0)
{
int nRes = aVendorInfo->compareVersions(sTheMinVersion);
int nRes = 0;
try
{
nRes = aVendorInfo->compareVersions(sTheMinVersion);
}
catch (MalformedVersionException&)
{
//The plug-in must guarantee that the versions from the vendor
//are all recognized.
OSL_ASSERT(0);
return JFW_PLUGIN_E_NO_JRE;
}
if (nRes < 0)
return JFW_PLUGIN_E_FAILED_VERSION;
}
@@ -306,7 +317,18 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
rtl::OUString sTheMaxVersion((rtl_uString*) sMaxVersion);
if (sTheMaxVersion.getLength() > 0)
{
int nRes = aVendorInfo->compareVersions(sTheMaxVersion);
int nRes = 0;
try
{
nRes = aVendorInfo->compareVersions(sTheMaxVersion);
}
catch (MalformedVersionException&)
{
//The plug-in must guarantee that the versions from the vendor
//are all recognized.
OSL_ASSERT(0);
return JFW_PLUGIN_E_NO_JRE;
}
if (nRes > 0)
return JFW_PLUGIN_E_FAILED_VERSION;
}
@@ -316,7 +338,18 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
for (int i = 0; i < nLenList; i++)
{
rtl::OUString sExVer((rtl_uString*) arExcludeList[i]);
int nRes = aVendorInfo->compareVersions(sExVer);
int nRes = 0;
try
{
nRes = aVendorInfo->compareVersions(sExVer);
}
catch (MalformedVersionException&)
{
//The plug-in must guarantee that the versions from the vendor
//are all recognized.
OSL_ASSERT(0);
return JFW_PLUGIN_E_NO_JRE;
}
if (nRes == 0)
return JFW_PLUGIN_E_FAILED_VERSION;
}
@@ -353,16 +386,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
javaPluginError errcode = JFW_PLUGIN_E_NONE;
if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL)
return JFW_PLUGIN_E_INVALID_ARG;
//Todo check if the Vendor (pInfo->sVendor) is supported by this plugin
rtl::OUString sVendor(pInfo->sVendor);
rtl::OUString sSunVendor(OUSTR(SUN_MICRO));
if (sVendor.equals(sSunVendor) == sal_False)
return JFW_PLUGIN_E_WRONG_VENDOR;
// On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because
// libjdwp.so need a symbol (fork1) from libjvm which it only gets if the jvm is loaded
// witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with libjvm.so
rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
oslModule moduleRt =
osl_loadModule(sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT);
oslModule moduleRt = 0;
#if defined(LINUX)
if ((moduleRt = osl_loadModule(sRuntimeLib.pData,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW)) == 0 )
@@ -429,7 +459,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// be encoded with the system encoding (i.e., osl_getThreadTextEncoding):
JavaVMInitArgs vm_args;
boost::scoped_array<JavaVMOption> sarOptions(
new JavaVMOption[cOptions + 1]);
JavaVMOption * options = sarOptions.get();