From b2c1ba213143444163a0d4208f163fc1726421a7 Mon Sep 17 00:00:00 2001 From: Serge Krot Date: Wed, 25 Mar 2020 16:56:18 +0100 Subject: speed-up: preload JVM when PreloadJVM is set Change-Id: I57f77f127f7cb45fb181b755b40873d47015e5b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91059 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens --- stoc/source/javaloader/javaloader.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'stoc/source') 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 SAL_CALL JavaComponentLoader::activate( const OUString & rImplName, const OUString & blabla, const OUString & rLibName, const css::uno::Reference & xKey) { + if (rImplName.isEmpty() && blabla.isEmpty() && rLibName.isEmpty()) + { + // preload JVM was requested + (void)getJavaLoader(); + return css::uno::Reference(); + } + const css::uno::Reference & loader = getJavaLoader(); if (!loader.is()) throw CannotActivateFactoryException("Could not create Java implementation loader"); -- cgit