[Libreoffice-commits] core.git: 2 commits - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/hsqldb/HDriver.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f4fc81b0b3f90523e485946546bdd83f85e249f7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jun 2 13:27:15 2015 +0200

    hsqldb flush: protect against weak ref having expired
    
    Change-Id: I5967271c1c154ab4cf5555d30d3812183ea2a6b7

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 4728f85..87eb271 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -619,7 +619,8 @@ namespace connectivity
             try
             {
                 Reference<XFlushable> xCon(i->second.second.first.get(),UNO_QUERY);
-                xCon->flush();
+                if (xCon.is())
+                    xCon->flush();
             }
             catch(Exception&)
             {
commit 63314e5114ecd32246e0dbcd3054d37f612fb407
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jun 2 13:30:19 2015 +0200

    more debugging information
    
    Change-Id: I9bb95b80e0e85573a09b8ad7233c6543fccae032

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e52f95c..4728f85 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -53,6 +53,7 @@
 #include "resource/hsqldb_res.hrc"
 #include "resource/sharedresources.hxx"
 #include <i18nlangtag/languagetag.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <o3tl/compat_functional.hxx>
 
@@ -622,6 +623,7 @@ namespace connectivity
             }
             catch(Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
     }