1 files changed, 24 insertions, 25 deletions
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 65457ab1d129..bb07d6673fb1 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <hsqldb/HStorageMap.hxx>
-#include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::uno;
@@ -44,42 +43,42 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_S
 {
     TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key));
     auto storage = aStoragePair.mapStorage();
-    if ( storage.is() )
+    if ( !storage )
+        return JNI_FALSE;
+
+    try
     {
+        OUString sName = StorageContainer::jstring2ustring(env,name);
         try
         {
-            OUString sName = StorageContainer::jstring2ustring(env,name);
-            try
+            OUString sOldName = StorageContainer::removeOldURLPrefix(sName);
+            if ( storage->isStreamElement(sOldName) )
             {
-                OUString sOldName = StorageContainer::removeOldURLPrefix(sName);
-                if ( storage->isStreamElement(sOldName) )
+                try
+                {
+                    storage->renameElement(sOldName,StorageContainer::removeURLPrefix(sName,aStoragePair.url));
+                }
+                catch(const Exception&)
                 {
-                    try
-                    {
-                        storage->renameElement(sOldName,StorageContainer::removeURLPrefix(sName,aStoragePair.url));
-                    }
-                    catch(const Exception&)
-                    {
-                    }
                 }
             }
-            catch(const NoSuchElementException&)
-            {
-            }
-            catch(const IllegalArgumentException&)
-            {
-            }
-            return storage->isStreamElement(StorageContainer::removeURLPrefix(sName,aStoragePair.url));
         }
         catch(const NoSuchElementException&)
         {
         }
-        catch(const Exception&)
+        catch(const IllegalArgumentException&)
         {
-            TOOLS_WARN_EXCEPTION("connectivity.hsqldb", "forwarding");
-            if (env->ExceptionCheck())
-                env->ExceptionClear();
         }
+        return storage->isStreamElement(StorageContainer::removeURLPrefix(sName,aStoragePair.url));
+    }
+    catch(const NoSuchElementException&)
+    {
+    }
+    catch(const Exception&)
+    {
+        TOOLS_WARN_EXCEPTION("connectivity.hsqldb", "forwarding");
+        if (env->ExceptionCheck())
+            env->ExceptionClear();
     }
     return JNI_FALSE;
 }