From 666ec98b7e10ca8acd891363587fd345373b3716 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 20 Oct 2014 21:50:23 +0200
Subject: dbaccess: surely the problem is that the storage could _not_ be
 committed?

Change-Id: I03e7e09e185e9cb25868c86de0b402b89e7f5d75
---
 dbaccess/source/core/dataaccess/ModelImpl.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 72cc6b276e02..b756bc8432f3 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -54,6 +54,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <tools/errcode.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/sharedunocomponent.hxx>
@@ -796,12 +797,9 @@ Reference< XSingleServiceFactory > ODatabaseModelImpl::createStorageFactory() co
 void ODatabaseModelImpl::commitRootStorage()
 {
     Reference< XStorage > xStorage( getOrCreateRootStorage() );
-#if OSL_DEBUG_LEVEL > 0
-    bool bSuccess =
-#endif
-    commitStorageIfWriteable_ignoreErrors( xStorage );
-    OSL_ENSURE( bSuccess || !xStorage.is(),
-        "ODatabaseModelImpl::commitRootStorage: could commit the storage!" );
+    bool bSuccess = commitStorageIfWriteable_ignoreErrors( xStorage );
+    SAL_WARN_IF(!bSuccess && xStorage.is(), "dbaccess",
+        "ODatabaseModelImpl::commitRootStorage: could not commit the storage!");
 }
 
 Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
-- 
cgit