summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/hsqldb/HStorageMap.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-04-18 10:51:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-04-18 20:35:49 +0200
commit2d0bdcc586af71dae665646b37177fa104c50906 (patch)
treea4c0fafefd366b2840365a3e0ee83ed0ad314bbd /connectivity/source/drivers/hsqldb/HStorageMap.cxx
parent02f7d20f14dffcb3832264eeab5bb97acc4977f3 (diff)
loplugin:flatten connectivity
Change-Id: Ic1d9eb84b64ebde99e15704a10b27f21447df4d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92469 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers/hsqldb/HStorageMap.cxx')
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 598ef060bc4c..d10ee29a69f6 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -233,25 +233,25 @@ namespace connectivity::hsqldb
{
TStorages& rMap = lcl_getStorageMap();
TStorages::iterator aFind = rMap.find(_sKey);
- if ( aFind != rMap.end() )
+ if ( aFind == rMap.end() )
+ return;
+
+ try
{
- try
+ if ( _xListener.is() )
{
- if ( _xListener.is() )
- {
- Reference<XTransactionBroadcaster> xBroad(aFind->second.mapStorage(),UNO_QUERY);
- if ( xBroad.is() )
- xBroad->removeTransactionListener(_xListener);
- Reference<XTransactedObject> xTrans(aFind->second.mapStorage(),UNO_QUERY);
- if ( xTrans.is() )
- xTrans->commit();
- }
+ Reference<XTransactionBroadcaster> xBroad(aFind->second.mapStorage(),UNO_QUERY);
+ if ( xBroad.is() )
+ xBroad->removeTransactionListener(_xListener);
+ Reference<XTransactedObject> xTrans(aFind->second.mapStorage(),UNO_QUERY);
+ if ( xTrans.is() )
+ xTrans->commit();
}
- catch(const Exception&)
- {
- }
- rMap.erase(aFind);
}
+ catch(const Exception&)
+ {
+ }
+ rMap.erase(aFind);
}
TStreamMap::mapped_type StorageContainer::registerStream(JNIEnv * env,jstring name, jstring key,sal_Int32 _nMode)