summaryrefslogtreecommitdiff
path: root/cppuhelper/source/bootstrap.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cppuhelper/source/bootstrap.cxx')
-rw-r--r--cppuhelper/source/bootstrap.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 144394ca9..914061327 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -352,14 +352,6 @@ Reference< registry::XSimpleRegistry > nestRegistries(
}
catch(registry::InvalidRegistryException & invalidRegistryException)
{
- if (! optional)
- {
- // if a registry was explicitly given, the exception shall fly
- if( ! bFallenBack )
- throw;
- }
-
- (void) invalidRegistryException;
#if OSL_DEBUG_LEVEL > 1
OString rdb_name_tmp = OUStringToOString(
rdb_name, RTL_TEXTENCODING_ASCII_US );
@@ -369,6 +361,14 @@ Reference< registry::XSimpleRegistry > nestRegistries(
"warning: couldn't open %s cause of %s",
rdb_name_tmp.getStr(), message_dbg.getStr() );
#endif
+ if (! optional)
+ {
+ // if a registry was explicitly given, the exception shall fly
+ if( ! bFallenBack )
+ throw;
+ }
+
+ (void) invalidRegistryException;
}
}
while(index != -1 && csl_rdbs.getLength()); // are there more rdbs in list?