Merge pull request #632 from BioEcoForests/master

Always delete WFS network replies, fixes #7588
qgis · Jun 4, 2013 · 91eaa41 · 91eaa41
2 parents f9a0a1d + b7c07de
commit 91eaa41
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp
@@ -148,32 +148,36 @@ void QgsWFSCapabilities::requestCapabilities()
 
 void QgsWFSCapabilities::capabilitiesReplyFinished()
 {
+  QNetworkReply* reply = mCapabilitiesReply;
+
+  reply->deleteLater();
+  mCapabilitiesReply = 0;
+
   // handle network errors
-  if ( mCapabilitiesReply->error() != QNetworkReply::NoError )
+  if ( reply->error() != QNetworkReply::NoError )
   {
     mErrorCode = QgsWFSCapabilities::NetworkError;
-    mErrorMessage = mCapabilitiesReply->errorString();
+    mErrorMessage = reply->errorString();
     emit gotCapabilities();
     return;
   }
 
   // handle HTTP redirects
-  QVariant redirect = mCapabilitiesReply->attribute( QNetworkRequest::RedirectionTargetAttribute );
+  QVariant redirect = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
   if ( !redirect.isNull() )
   {
     QgsDebugMsg( "redirecting to " + redirect.toUrl().toString() );
     QNetworkRequest request( redirect.toUrl() );
     request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork );
     request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
 
-    mCapabilitiesReply->deleteLater();
     mCapabilitiesReply = QgsNetworkAccessManager::instance()->get( request );
 
     connect( mCapabilitiesReply, SIGNAL( finished() ), this, SLOT( capabilitiesReplyFinished() ) );
     return;
   }
 
-  QByteArray buffer = mCapabilitiesReply->readAll();
+  QByteArray buffer = reply->readAll();
 
   QgsDebugMsg( "parsing capabilities: " + buffer );
 
@@ -264,8 +268,6 @@ void QgsWFSCapabilities::capabilitiesReplyFinished()
     mCaps.featureTypes.append( featureType );
   }
 
-  mCapabilitiesReply->deleteLater();
-  mCapabilitiesReply = 0;
   emit gotCapabilities();
 }