oracle provider: fix closing of iterator in case of error

qgis · Jun 30, 2014 · 87e4b07 · 87e4b07
1 parent 99d4472
commit 87e4b07
Showing 1 changed file with 3 additions and 6 deletions.
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();