diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2020-03-25 16:56:18 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-09-24 15:01:32 +0200 |
| commit | b2c1ba213143444163a0d4208f163fc1726421a7 (patch) | |
| tree | 3ebbc619ce7bad03923523b5ba656ef8b58cf825 /stoc | |
| parent | 4e4362daade150f3f34520bd5e6e4673ea88efce (diff) | |
speed-up: preload JVM when PreloadJVM is set
Change-Id: I57f77f127f7cb45fb181b755b40873d47015e5b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91059
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 8 |
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"); |