diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-08 18:27:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-09 10:47:22 +0200 |
| commit | c5c981c60d449549c00c5457c93e3c48a0488d7b (patch) | |
| tree | e2a606603ceecb5f58e09120eeff93686f9af994 /ure | |
| parent | de536db02e13bfeed716ad6e8b4d9a12c421aca9 (diff) | |
ServiceManager::createInstanceWithContext needs to honor given Context
...in loadImplementation (instead of using the context the ServiceManager itself
was created with). Otherwise, the handcrafted context containing a fake
theJavaVirtualMachine singleton in install_vm_singleton
(javaunohelper/source/vm.cxx) would not be honored, so that if a Java process
bootstraps native (binary) UNO and from there tries to obtain that singleton, it
would erroneously try to instantiate another JVM instead of using the existing
one. This was a regression introduced with the new ServiceManager and could be
witnessed by test-javanative in ure/source/uretest/Makefile failing.
Change-Id: I58cfbc8cdaea7ee4ab80fac728ea3e85676d69e1
(cherry picked from commit 9fc870fc33c2872aa93477523da4a54c841cf9b5)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'ure')
0 files changed, 0 insertions, 0 deletions