oracle provider: fix closing of iterator in case of error

jef-n · jef-n · commit 87e4b074c720 · 2014-06-30T15:48:51.000+02:00
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -107,8 +107,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
     whereClause += "(" + mSource->mSqlWhereClause + ")";
   }
 
-  if ( !openQuery( whereClause ) )
-    return;
+  openQuery( whereClause );
 }
 
 QgsOracleFeatureIterator::~QgsOracleFeatureIterator()
@@ -252,10 +251,8 @@ bool QgsOracleFeatureIterator::rewind()
 
 bool QgsOracleFeatureIterator::close()
 {
-  if ( !mQry.isActive() )
-    return false;
-
-  mQry.finish();
+  if ( mQry.isActive() )
+    mQry.finish();
 
   if ( mConnection )
     mConnection->disconnect();

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour`
`107`	`107`	`whereClause += "(" + mSource->mSqlWhereClause + ")";`
`108`	`108`	`}`
`109`	`109`
`110`		`- if ( !openQuery( whereClause ) )`
`111`		`- return;`
	`110`	`+ openQuery( whereClause );`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`QgsOracleFeatureIterator::~QgsOracleFeatureIterator()`
`@@ -252,10 +251,8 @@ bool QgsOracleFeatureIterator::rewind()`
`252`	`251`
`253`	`252`	`bool QgsOracleFeatureIterator::close()`
`254`	`253`	`{`
`255`		`- if ( !mQry.isActive() )`
`256`		`- return false;`
`257`		`-`
`258`		`- mQry.finish();`
	`254`	`+ if ( mQry.isActive() )`
	`255`	`+ mQry.finish();`
`259`	`256`
`260`	`257`	`if ( mConnection )`
`261`	`258`	`mConnection->disconnect();`