Move QgsOgrConnPool::instance()->unref() from QgsOgrProvider::close() to destructor, since we can open()/close() several times

rouault · rouault · commit fe32ba40b920 · 2016-05-29T11:02:51.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -384,6 +384,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
 QgsOgrProvider::~QgsOgrProvider()
 {
   close();
+  QgsOgrConnPool::instance()->unref( mFilePath );
 }
 
 QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const
@@ -2969,8 +2970,6 @@ void QgsOgrProvider::close()
   setProperty( "_debug_open_mode", "invalid" );
 
   updateExtents();
-
-  QgsOgrConnPool::instance()->unref( mFilePath );
 }
 
 void QgsOgrProvider::reloadData()

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`384`	`384`	`QgsOgrProvider::~QgsOgrProvider()`
`385`	`385`	`{`
`386`	`386`	`close();`
	`387`	`+ QgsOgrConnPool::instance()->unref( mFilePath );`
`387`	`388`	`}`
`388`	`389`
`389`	`390`	`QgsAbstractFeatureSource* QgsOgrProvider::featureSource() const`
`@@ -2969,8 +2970,6 @@ void QgsOgrProvider::close()`
`2969`	`2970`	`setProperty( "_debug_open_mode", "invalid" );`
`2970`	`2971`
`2971`	`2972`	`updateExtents();`
`2972`		`-`
`2973`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
`2974`	`2973`	`}`
`2975`	`2974`
`2976`	`2975`	`void QgsOgrProvider::reloadData()`