[oracle] Fix potential crash on exit

qgis · Jul 12, 2016 · 2ccc7e1 · 2ccc7e1
1 parent aaa654f
commit 2ccc7e1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/providers/oracle/qgsoracleconnpool.cpp b/src/providers/oracle/qgsoracleconnpool.cpp
@@ -16,11 +16,19 @@
 #include "qgsoracleconnpool.h"
 #include "qgsoracleconn.h"
 
-QgsOracleConnPool QgsOracleConnPool::sInstance;
+QgsOracleConnPool* QgsOracleConnPool::sInstance = nullptr;
 
 QgsOracleConnPool* QgsOracleConnPool::instance()
 {
-  return &sInstance;
+  if ( !sInstance )
+    sInstance = new QgsOracleConnPool();
+  return sInstance;
+}
+
+void QgsOracleConnPool::cleanupInstance()
+{
+  delete sInstance;
+  sInstance = nullptr;
 }
 
 QgsOracleConnPool::QgsOracleConnPool() : QgsConnectionPool<QgsOracleConn*, QgsOracleConnPoolGroup>()

diff --git a/src/providers/oracle/qgsoracleconnpool.h b/src/providers/oracle/qgsoracleconnpool.h
@@ -70,14 +70,16 @@ class QgsOracleConnPool : public QgsConnectionPool<QgsOracleConn*, QgsOracleConn
   public:
     static QgsOracleConnPool* instance();
 
+    static void cleanupInstance();
+
   protected:
     Q_DISABLE_COPY( QgsOracleConnPool )
 
   private:
     QgsOracleConnPool();
     ~QgsOracleConnPool();
 
-    static QgsOracleConnPool sInstance;
+    static QgsOracleConnPool* sInstance;
 };
 
 

diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -3177,6 +3177,11 @@ QGISEXTERN bool deleteLayer( const QString& uri, QString& errCause )
   return true;
 }
 
+QGISEXTERN void cleanupProvider()
+{
+  QgsOracleConnPool::cleanupInstance();
+}
+
 // ----------