diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-14 06:10:15 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-14 06:10:15 +0200 |
| commit | 4badcfda55996891d99b1f0a8cc47028acd1c0c1 (patch) | |
| tree | f06beb7189f2e21742505ba4d31979400d90a954 /jvmfwk | |
| parent | 350772317dd0bd226c33b1945f3801fcb146891b (diff) | |
Revert "Related: #i119525# List only JREs whose jvm library can be loaded"
This reverts commit 37ca14359b8c4027f1d9f9569ddfa2740cd2731e.
This breaks the loading of the jvm.dll on Windows if the msvcr*.dll is
not in the system path.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index b1cd72231d64..6fa931d44eb7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -19,9 +19,6 @@ #include "osl/file.hxx" -#include "osl/diagnose.h" -#include "osl/module.hxx" -#include "osl/thread.hxx" #include "vendorbase.hxx" #include "util.hxx" @@ -161,25 +158,6 @@ 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; |