Commit Graph

18 Commits

Author SHA1 Message Date
Stephan Bergmann
2171077c0c Introduce cppu::supportsService helper, adapt some call-sites
...more to follow (easy hack?)

Change-Id: Icb02626495701a3905c124c7368b98c3258e91b2
2012-09-14 19:32:30 +02:00
Stephan Bergmann
35d474ff8c Fix removeRdbFiles (caused extension update to fail)
removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the
corresponding component (.so, .jar, etc.), but not the .rdb file.  So removing
an .rdb file silently failed to remove the corresponding implementations, so re-
installing a similar enough .rdb (as typically happens during extension update)
would fail due to duplicate implementation names.

Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
2012-08-24 17:18:28 +02:00
Stephan Bergmann
8caf1164ee Missing mutex lock
Change-Id: Ifddd6131c2e62057561d4b17eeda88568f6ccf7c
2012-08-10 14:35:04 +02:00
Stephan Bergmann
142d3ec875 Related fdo#52639: Do not destroy Implementations with mutex locked
Erasing from data_ member maps can destroy contained Implementations, which in
turn releases the UNO objects referenced from there, which in turn can cause
XComponents to dispose, which in turn can call arbitrary code, so must not be
done with rMutex locked.  Witness the backtrace at
<https://bugs.freedesktop.org/attachment.cgi?id=65142> linked from fdo#52639
(where this fix appears otherwise unrelated to that issue's main topic).

Change-Id: If55a3841b761ec1d9a0ef61fe54784426c4ee442
2012-08-09 17:44:14 +02:00
Stephan Bergmann
9fc870fc33 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
2012-08-08 18:36:40 +02:00
Stephan Bergmann
2e7702fb70 fdo#51143 Do not wrap CannotActivateFactoryException as DeploymentException
...as some client code catches just the former and thus fails now.  (This was a
regression introduced with the recent cppuhelper/source/defaultbootstrap.cxx.)

Change-Id: I8306797f8331d894ab4e7695478e3824e9f79197
2012-07-13 12:12:41 +02:00
Tor Lillqvist
f79d5b9116 Unbreak stuff on iOS a bit after bootstrapping changes
Change-Id: I0d2ebfc9aa78a9fed057b853d54797a88218c587
2012-06-04 11:41:50 +03:00
Stephan Bergmann
5fd78feebe Revert "bootstrapping should elide duplicate .rdb paths in the configuration"
This reverts commit b162aec625, which increased
code complexity for no benefit (the dubious scenario it was introduced for
concerned duplicate service rdbs rather than type rdbs, anyway).
2012-06-01 10:10:07 +02:00
Stephan Bergmann
0951b76a00 Add "virtual" for consistency
Change-Id: I8ecc2edde553edbd80ca04e2f3d541c31f516211
2012-06-01 10:09:18 +02:00
Stephan Bergmann
c16d0dd846 fdo#49291 Postpone actual factory instantiation as long as possible
...see comment in ServiceManager::createContentEnumeration for a rationale.

Splitting ImplementationInfo out of Implementation has become necessary to avoid
circular references.

Change-Id: I29aef81ce78b9ab71e18663f8c7e6ca913c6a650
2012-06-01 09:59:49 +02:00
Michael Meeks
b162aec625 bootstrapping should elide duplicate .rdb paths in the configuration 2012-05-22 11:35:36 +01:00
Stephan Bergmann
d8ade3ccf6 Added link to LanguageTool.oxt issue
Change-Id: Ifab63273b12963e748c9b937648b2079fcd0c796
2012-05-14 18:48:22 +02:00
Stephan Bergmann
3b1798a55b Work around extension factories not implementing XServiceInfo
...that would otherwise lead to "Bad insert element" failure during live-insertion.

Change-Id: I74f883c9b613f03256abb7be7657f25b418f821d
2012-05-14 18:20:30 +02:00
Caolán McNamara
f5a414d242 WaE: simple minded MSVC2008 thinks s could be used uninitialized 2012-04-24 11:56:49 +01:00
Stephan Bergmann
015283bb50 Trying to parse legacy rdb as XML can cause InvalidRegistryException, too 2012-04-23 18:41:29 +02:00
Stephan Bergmann
0bbf79005a Do not fail for legacy rdb that only contains root key 2012-04-23 11:47:45 +02:00
Stephan Bergmann
18a9e9e844 Various clean up of previous commit 2012-04-20 23:37:14 +02:00
Stephan Bergmann
c2fd9b533c New cppu::defaultBootstrap_InitialComponentContext implementation
...that no longer uses XSimpleRegistry structures for the service data and thus
is potentially more performant.

* Registry-based functions from cppuhelper/bootstrap are deprecated now, client
  code should always use defaultBootstrap_InitialComponentContext.

* References to the obsolete UNO_WRITERDB have been removed.

* Some of the functions in cppuhelper/source that are used from multiple .cxx
  but had not been properly placed into .hxx have been cleaned up.

* css.lang.ServiceManager XSet insert/remove now support special
  sequence<NamedValue> to improve live deployment/removal of XML-based extension
  components data.

* 09524d410b "stoc: accelerate opening of multiple
  XML .rdb files in a directory" and its follow-up
  cb5c881a7f "avoid using the new rdb reading
  logic for empty/non-existent directories" have been obsoleted by this change
  and have been reverted again.
2012-04-20 22:57:32 +02:00