diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-18 12:41:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-18 12:47:39 +0100 |
| commit | e5546342cb4e4f106257a7f7594d4356e6adbff3 (patch) | |
| tree | 67ece730e412102febfae147645670d2653094d7 /jvmfwk/inc | |
| parent | 39da5cf13337d2945b802587f5b0d9d4ef0512dd (diff) | |
Let JavaVirtualMachine::getJavaVm start the VM it already found
Since b69951996967a1c79e3a55dd13dd5609b19db6a1 "Drop support for /etc/opt/ure
and ~/.ure from LibreOffice 4" there is no place any more where a plain URE will
store information about a selected JVM, so JavaVirtualMachine::getJavaVM will
go into an endless loop of jfw_startVM -> JFW_E_NO_SELECT ->
jfw_findAndSelectJRE -> jfw_startVM -> ... The solution is to pass the JavaInfo
determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM
(for which the parameter list of the latter needed to be changed), instead of
relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating that
information via user configuration files.
Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
Diffstat (limited to 'jvmfwk/inc')
| -rw-r--r-- | jvmfwk/inc/jvmfwk/framework.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 98c49c3cb3b2..7f61f2139d5a 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -482,6 +482,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( created and JFW_E_NEED_RESTART error is returned. If a VM is already running then a JFW_E_RUNNING_JVM is returned.</p> + @param pInfo + [in] optional pointer to a specific JRE; must be caller-freed if not NULL @param arOptions [in] the array containing additional start arguments or NULL. @param nSize @@ -516,9 +518,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE determined by <code>JAVA_HOME</code>does not meet the version requirements. */ -JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, - sal_Int32 nSize, JavaVM **ppVM, - JNIEnv **ppEnv); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM( + JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize, + JavaVM ** ppVM, JNIEnv ** ppEnv); /** determines the JRE that is to be used. |