Kaydet (Commit) 4badcfda authored tarafından Markus Mohrhard's avatar Markus Mohrhard

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

This reverts commit 37ca1435.

This breaks the loading of the jvm.dll on Windows if the msvcr*.dll is
not in the system path.
üst 35077231
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#include "osl/file.hxx" #include "osl/file.hxx"
#include "osl/diagnose.h"
#include "osl/module.hxx"
#include "osl/thread.hxx"
#include "vendorbase.hxx" #include "vendorbase.hxx"
#include "util.hxx" #include "util.hxx"
...@@ -161,25 +158,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) ...@@ -161,25 +158,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
if (!bRt) if (!bRt)
return false; 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 // init m_sLD_LIBRARY_PATH
OSL_ASSERT(!m_sHome.isEmpty()); OSL_ASSERT(!m_sHome.isEmpty());
size = 0; size = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment