close connection when deleting oracle transaction

qgis · Jan 2, 2020 · 00d0a06 · 00d0a06
1 parent 94d0b06
commit 00d0a06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/providers/oracle/qgsoracleconn.cpp b/src/providers/oracle/qgsoracleconn.cpp
@@ -201,6 +201,7 @@ void QgsOracleConn::reconnect()
 
 void QgsOracleConn::unref()
 {
+  QMutexLocker locker( &mLock );
   if ( --mRef > 0 )
     return;
 
@@ -218,7 +219,9 @@ void QgsOracleConn::unref()
     }
   }
 
-  deleteLater();
+  // to avoid destroying locked mutex
+  locker.unlock();
+  delete this;
 }
 
 bool QgsOracleConn::exec( QSqlQuery &qry, const QString &sql, const QVariantList &params )

diff --git a/src/providers/oracle/qgsoracletransaction.cpp b/src/providers/oracle/qgsoracletransaction.cpp
@@ -29,6 +29,12 @@ QgsOracleTransaction::QgsOracleTransaction( const QString &connString )
 
 }
 
+QgsOracleTransaction::~QgsOracleTransaction()
+{
+  if ( mConn )
+    mConn->unref();
+}
+
 bool QgsOracleTransaction::beginTransaction( QString &, int /* statementTimeout */ )
 {
   mConn = QgsOracleConn::connectDb( mConnString, true /*transaction*/ );

diff --git a/src/providers/oracle/qgsoracletransaction.h b/src/providers/oracle/qgsoracletransaction.h
@@ -33,6 +33,8 @@ class QgsOracleTransaction : public QgsTransaction
   public:
     explicit QgsOracleTransaction( const QString &connString );
 
+    ~QgsOracleTransaction() override;
+
     bool executeSql( const QString &sql, QString &error, bool isDirty = false, const QString &name = QString() ) override;
 
     QgsOracleConn *connection() const { return mConn; }