[WFS provider] Transmit error message of feature downloader to provider

qgis · May 21, 2021 · bc3ba06 · bc3ba06
1 parent b5c5cc7
commit bc3ba06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp b/src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp
@@ -177,6 +177,8 @@ void QgsFeatureDownloaderImpl::endOfRun( bool serializeFeatures,
 
   if ( serializeFeatures )
     mSharedBase->endOfDownload( success, totalDownloadedFeatureCount, truncatedResponse, interrupted, errorMessage );
+  else if ( !errorMessage.isEmpty() )
+    mSharedBase->pushError( errorMessage );
 
   // We must emit the signal *AFTER* the previous call to mShared->endOfDownload()
   // to avoid issues with iterators that would start just now, wouldn't detect

diff --git a/src/providers/wfs/qgsbackgroundcachedshareddata.h b/src/providers/wfs/qgsbackgroundcachedshareddata.h
@@ -179,6 +179,9 @@ class QgsBackgroundCachedSharedData
     //! Return layer name
     virtual QString layerName() const = 0;
 
+    //! Called when an error must be raised to the provider
+    virtual void pushError( const QString &errorMsg ) = 0;
+
   protected:
 
     //////////// Input members. Implementations should define them to meaningful values
@@ -318,9 +321,6 @@ class QgsBackgroundCachedSharedData
 
     ///////////////// PURE VIRTUAL METHODS ////////////////////////
 
-    //! Called when an error must be raised to the provider
-    virtual void pushError( const QString &errorMsg ) = 0;
-
     //! Called when the extent is updated
     virtual void emitExtentUpdated() = 0;