[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-2' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/firebird/StatementCommonBase.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbab72ced58e469e6394e853ce0013f3699d85d3
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Thu Jan 31 17:15:26 2019 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Mar 15 20:59:09 2019 +0100

    tdf#122129 Firebird: fix concurrency issue
    
    Allow only one isc_dsql_prepare at a time.
    
    Change-Id: I3d5974057272cd47697aeb7be54579d0c1a662a0
    Reviewed-on: https://gerrit.libreoffice.org/67231
    Tested-by: Jenkins
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    (cherry picked from commit 6affbd2b57a336749a6a2ab3466a4e652a7ff365)
    Reviewed-on: https://gerrit.libreoffice.org/69227
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit bd5ef0f1ecb445021fc693bfd3cab0979a4c4c28)
    Reviewed-on: https://gerrit.libreoffice.org/69281
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 03439c937c12..8d3c4b42abec 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <propertyids.hxx>
+#include <vcl/svapp.hxx>
 #include <TConnection.hxx>
 
 using namespace ::connectivity::firebird;
@@ -126,7 +127,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
                                                       XSQLDA*& pOutSqlda,
                                                       XSQLDA* pInSqlda)
 {
-    MutexGuard aGuard(m_aMutex);
+    SolarMutexGuard g; // tdf#122129
 
     freeStatementHandle();