Trying to parse legacy rdb as XML can cause InvalidRegistryException, too

015283bb · Stephan Bergmann · b0547b35 · 015283bb
Kaydet (Commit) 015283bb authored Nis 23, 2012 tarafından Stephan Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

defaultbootstrap.cxx cppuhelper/source/defaultbootstrap.cxx +5 -3

No files found.
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1276,9 +1276,11 @@ void ServiceManager::readRdbFile(rtl::OUString const & uri, bool optional) {
        }
        SAL_INFO("cppuhelper", "Ignored optional " << uri);
    } catch (css::registry::InvalidRegistryException & e) {
-        throw css::uno::DeploymentException(
+        if (!readLegacyRdbFile(uri)) {
-            "InvalidRegistryException: " + e.Message,
+            throw css::uno::DeploymentException(
-            static_cast< cppu::OWeakObject * >(this));
+                "InvalidRegistryException: " + e.Message,
+                static_cast< cppu::OWeakObject * >(this));
+        }
    } catch (css::uno::RuntimeException &) {
        if (!readLegacyRdbFile(uri)) {
            throw;