Destroy invalidated connection pool connections when released

qgis · Feb 3, 2016 · eb3541e · eb3541e
1 parent 50bbd6f
commit eb3541e
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/core/qgsconnectionpool.h b/src/core/qgsconnectionpool.h
@@ -128,15 +128,22 @@ class QgsConnectionPoolGroup
     {
       connMutex.lock();
       acquiredConns.removeAll( conn );
-      Item i;
-      i.c = conn;
-      i.lastUsedTime = QTime::currentTime();
-      conns.push( i );
-
-      if ( !expirationTimer->isActive() )
+      if ( !qgsConnectionPool_ConnectionIsValid( conn ) )
+      {
+        qgsConnectionPool_ConnectionDestroy( conn );
+      }
+      else
       {
-        // will call the slot directly or queue the call (if the object lives in a different thread)
-        QMetaObject::invokeMethod( expirationTimer->parent(), "startExpirationTimer" );
+        Item i;
+        i.c = conn;
+        i.lastUsedTime = QTime::currentTime();
+        conns.push( i );
+
+        if ( !expirationTimer->isActive() )
+        {
+          // will call the slot directly or queue the call (if the object lives in a different thread)
+          QMetaObject::invokeMethod( expirationTimer->parent(), "startExpirationTimer" );
+        }
       }
 
       connMutex.unlock();