Skip to content

Commit b7c07de

Browse files
author
Laurent Defert
committed
Always delete WFS network replies, fixes #7588
1 parent f9a0a1d commit b7c07de

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/providers/wfs/qgswfscapabilities.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -148,32 +148,36 @@ void QgsWFSCapabilities::requestCapabilities()
148148

149149
void QgsWFSCapabilities::capabilitiesReplyFinished()
150150
{
151+
QNetworkReply* reply = mCapabilitiesReply;
152+
153+
reply->deleteLater();
154+
mCapabilitiesReply = 0;
155+
151156
// handle network errors
152-
if ( mCapabilitiesReply->error() != QNetworkReply::NoError )
157+
if ( reply->error() != QNetworkReply::NoError )
153158
{
154159
mErrorCode = QgsWFSCapabilities::NetworkError;
155-
mErrorMessage = mCapabilitiesReply->errorString();
160+
mErrorMessage = reply->errorString();
156161
emit gotCapabilities();
157162
return;
158163
}
159164

160165
// handle HTTP redirects
161-
QVariant redirect = mCapabilitiesReply->attribute( QNetworkRequest::RedirectionTargetAttribute );
166+
QVariant redirect = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
162167
if ( !redirect.isNull() )
163168
{
164169
QgsDebugMsg( "redirecting to " + redirect.toUrl().toString() );
165170
QNetworkRequest request( redirect.toUrl() );
166171
request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork );
167172
request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
168173

169-
mCapabilitiesReply->deleteLater();
170174
mCapabilitiesReply = QgsNetworkAccessManager::instance()->get( request );
171175

172176
connect( mCapabilitiesReply, SIGNAL( finished() ), this, SLOT( capabilitiesReplyFinished() ) );
173177
return;
174178
}
175179

176-
QByteArray buffer = mCapabilitiesReply->readAll();
180+
QByteArray buffer = reply->readAll();
177181

178182
QgsDebugMsg( "parsing capabilities: " + buffer );
179183

@@ -264,8 +268,6 @@ void QgsWFSCapabilities::capabilitiesReplyFinished()
264268
mCaps.featureTypes.append( featureType );
265269
}
266270

267-
mCapabilitiesReply->deleteLater();
268-
mCapabilitiesReply = 0;
269271
emit gotCapabilities();
270272
}
271273

0 commit comments

Comments
 (0)