Close active iterators

NathanW2 · NathanW2 · commit 6876540302bd · 2013-06-22T00:17:22.000+10:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -35,6 +35,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrProvider* p, const QgsFeatur
   : QgsAbstractFeatureIterator( request ), P( p ), ogrDataSource(0), ogrLayer(0), mSubsetStringSet(false)
 {
   mFeatureFetched = false;
+  P->mActiveIterators.insert( this );
 
   ogrDataSource = OGROpen( TO8F( P->filePath() ), false, NULL );
 
@@ -159,6 +160,8 @@ bool QgsOgrFeatureIterator::close()
   if ( mClosed )
     return false;
 
+  P->mActiveIterators.remove( this );
+
   if (mSubsetStringSet)
   {
     OGR_DS_ReleaseResultSet(ogrDataSource, ogrLayer );
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -209,7 +209,6 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     , ogrDriver( 0 )
     , valid( false )
     , featuresCounted( -1 )
-    , mActiveIterator( 0 )
 {
   QgsCPLErrorHandler handler;
 
@@ -362,6 +361,11 @@ QgsOgrProvider::~QgsOgrProvider()
 {
   // Do we need to close all active iterators here?
 
+  foreach ( QgsOgrFeatureIterator* it, mActiveIterators )
+  {
+    it->close();
+  }
+
   if ( ogrLayer != ogrOrigLayer )
   {
     OGR_DS_ReleaseResultSet( ogrDataSource, ogrLayer );
diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -339,5 +339,5 @@ class QgsOgrProvider : public QgsVectorDataProvider
     bool syncToDisc();
 
     friend class QgsOgrFeatureIterator;
-    QgsOgrFeatureIterator* mActiveIterator; //!< pointer to currently active iterator (0 if none)
+    QSet< QgsOgrFeatureIterator*> mActiveIterators;
 };

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrProvider* p, const QgsFeatur`
`35`	`35`	`: QgsAbstractFeatureIterator( request ), P( p ), ogrDataSource(0), ogrLayer(0), mSubsetStringSet(false)`
`36`	`36`	`{`
`37`	`37`	`mFeatureFetched = false;`
	`38`	`+ P->mActiveIterators.insert( this );`
`38`	`39`
`39`	`40`	`ogrDataSource = OGROpen( TO8F( P->filePath() ), false, NULL );`
`40`	`41`
`@@ -159,6 +160,8 @@ bool QgsOgrFeatureIterator::close()`
`159`	`160`	`if ( mClosed )`
`160`	`161`	`return false;`
`161`	`162`
	`163`	`+ P->mActiveIterators.remove( this );`
	`164`	`+`
`162`	`165`	`if (mSubsetStringSet)`
`163`	`166`	`{`
`164`	`167`	`OGR_DS_ReleaseResultSet(ogrDataSource, ogrLayer );`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`209`	`209`	`, ogrDriver( 0 )`
`210`	`210`	`, valid( false )`
`211`	`211`	`, featuresCounted( -1 )`
`212`		`- , mActiveIterator( 0 )`
`213`	`212`	`{`
`214`	`213`	`QgsCPLErrorHandler handler;`
`215`	`214`
`@@ -362,6 +361,11 @@ QgsOgrProvider::~QgsOgrProvider()`
`362`	`361`	`{`
`363`	`362`	`// Do we need to close all active iterators here?`
`364`	`363`
	`364`	`+ foreach ( QgsOgrFeatureIterator* it, mActiveIterators )`
	`365`	`+ {`
	`366`	`+ it->close();`
	`367`	`+ }`
	`368`	`+`
`365`	`369`	`if ( ogrLayer != ogrOrigLayer )`
`366`	`370`	`{`
`367`	`371`	`OGR_DS_ReleaseResultSet( ogrDataSource, ogrLayer );`