From 19d2ec6539f789dfbe38612e5e7807cac9fe0819 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Mar 2018 15:19:15 +0200 Subject: Don't pass empty option to JNI_CreateJavaVM sUserClassPath may be empty (instead of containing "-Djava.class.path=...") here, which older versions of Java have apparently silently ignored. But Java 10 now fails with JNI_EINVAL (-6). (Happens e.g. during CppunitTest_dbaccess_hsqldb_test.) Change-Id: Ifd13222f0d0ae69547bd1a9fe0fd5eae47917d0a Reviewed-on: https://gerrit.libreoffice.org/51949 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- jvmfwk/source/framework.cxx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index af5621addeb7..777133212082 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -247,22 +247,27 @@ javaFrameworkError jfw_startVM( // it contains the classpath and all options set in the //options dialog std::unique_ptr sarJOptions( - new JavaVMOption[arOptions.size() + 2 + vmParams.size()]); + new JavaVMOption[ + arOptions.size() + (sUserClassPath.isEmpty() ? 1 : 2) + vmParams.size()]); JavaVMOption * arOpt = sarJOptions.get(); if (! arOpt) return JFW_E_ERROR; //The first argument is the classpath - arOpt[0].optionString= const_cast(sUserClassPath.getStr()); - arOpt[0].extraInfo = nullptr; + int index = 0; + if (!sUserClassPath.isEmpty()) { + arOpt[index].optionString= const_cast(sUserClassPath.getStr()); + arOpt[index].extraInfo = nullptr; + ++index; + } // Set a flag that this JVM has been created via the JNI Invocation API // (used, for example, by UNO remote bridges to share a common thread pool // factory among Java and native bridge implementations): - arOpt[1].optionString = const_cast("-Dorg.openoffice.native="); - arOpt[1].extraInfo = nullptr; + arOpt[index].optionString = const_cast("-Dorg.openoffice.native="); + arOpt[index].extraInfo = nullptr; + ++index; //add the options set by options dialog - int index = 2; for (auto const & vmParam : vmParams) { arOpt[index].optionString = const_cast(vmParam.getStr()); -- cgit v1.2.3