summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamas Bunth <tamas.bunth@collabora.co.uk>2019-01-31 17:15:26 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-03-15 20:59:09 +0100
commitbbab72ced58e469e6394e853ce0013f3699d85d3 (patch)
treed57ec185d1bdeb34af57a5cae54839b3bc748061
parent8e26c5408d89951152d543e1d42b39ee8e5798a7 (diff)
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@gmail.com> (cherry picked from commit 6affbd2b57a336749a6a2ab3466a4e652a7ff365) Reviewed-on: https://gerrit.libreoffice.org/69227 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit bd5ef0f1ecb445021fc693bfd3cab0979a4c4c28) Reviewed-on: https://gerrit.libreoffice.org/69281 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--connectivity/source/drivers/firebird/StatementCommonBase.cxx3
1 files changed, 2 insertions, 1 deletions
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();