summaryrefslogtreecommitdiff
path: root/stoc/source
diff options
context:
space:
mode:
Diffstat (limited to 'stoc/source')
-rw-r--r--stoc/source/javaloader/javaloader.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 2b40cdd219db..73b0ddf557ff 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -304,11 +304,17 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo(
return loader->writeRegistryInfo(xKey, blabla, rLibName);
}
-
css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader::activate(
const OUString & rImplName, const OUString & blabla, const OUString & rLibName,
const css::uno::Reference<XRegistryKey> & xKey)
{
+ if (rImplName.isEmpty() && blabla.isEmpty() && rLibName.isEmpty())
+ {
+ // preload JVM was requested
+ (void)getJavaLoader();
+ return css::uno::Reference<XInterface>();
+ }
+
const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader();
if (!loader.is())
throw CannotActivateFactoryException("Could not create Java implementation loader");