• Stephan Bergmann's avatar
    Let JavaVirtualMachine::getJavaVm start the VM it already found · 0ec4ca54
    Stephan Bergmann yazdı
    Since b6995199 "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
    (cherry picked from commit e5546342)
    0ec4ca54
javavm.cxx 76.8 KB