[afs] Correctly return an invalid feature from closed iterators

qgis · Feb 20, 2018 · 5f12bd5c279f1f146a8cfc0217bc344002ae9747 · 5f12bd5
1 parent b434ab1
commit 5f12bd5c279f1f146a8cfc0217bc344002ae9747
Unified Split

Showing with 4 additions and 0 deletions.

+4 −0 src/providers/arcgisrest/qgsafsfeatureiterator.cpp
diff --git a/src/providers/arcgisrest/qgsafsfeatureiterator.cpp b/src/providers/arcgisrest/qgsafsfeatureiterator.cpp
@@ -62,6 +62,8 @@ QgsAfsFeatureIterator::~QgsAfsFeatureIterator()
 
 bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
 {
+  f.setValid( false );
+
   if ( mClosed )
     return false;
 
@@ -82,6 +84,7 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
   {
     bool result = mSource->sharedData()->getFeature( mRequest.filterFid(), f, fetchGeometries, fetchAttribures );
     geometryToDestinationCrs( f, mTransform );
+    f.setValid( result );
     return result;
   }
   else
@@ -96,6 +99,7 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
       if ( !success )
         continue;
       geometryToDestinationCrs( f, mTransform );
+      f.setValid( true );
       return true;
     }
   }