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

Related: #i119525# List only JREs whose jvm library can be loaded

Browse Source 
(cherry picked from commit 0b31fa19e50d8259d3cbe695723ea02e2c5ff711)

Change-Id: I1f96c6239d7278c4eb0c17b69f9d35e08eb8260b
This commit is contained in:
Ariel Constenla-Haile 2012-09-21 17:08:44 +00:00 committed by Caolán McNamara
parent 33c2427824
commit 37ca14359b
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
View File

@ -19,6 +19,9 @@
#include "osl/file.hxx"
#include "osl/diagnose.h"
#include "osl/module.hxx"
#include "osl/thread.hxx"
#include "vendorbase.hxx"
#include "util.hxx"
@ -158,6 +161,25 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
if (!bRt)
return false;
#if defined(WNT)
oslModule moduleRt = 0;
rtl::OUString sRuntimeLib;
if( File::getSystemPathFromFileURL( m_sRuntimeLibrary, sRuntimeLib ) == File::E_None )
{
if ( ( moduleRt = osl_loadModule( sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT ) ) == 0 )
{
OSL_TRACE( "jfw_plugin::VendorBase::initialize - cannot load library %s",
rtl::OUStringToOString( sRuntimeLib, osl_getThreadTextEncoding() ).getStr() );
return false;
}
else
{
// do not leave the module loaded!
osl_unloadModule( moduleRt );
}
}
#endif
// init m_sLD_LIBRARY_PATH
OSL_ASSERT(!m_sHome.isEmpty());
size = 0;