Avoid deadlock by using Qt::DirectConnection

m-kuhn · m-kuhn · commit 143ee82ec974 · 2018-06-14T09:52:26.000+02:00
diff --git a/src/providers/wfs/qgswfsrequest.cpp b/src/providers/wfs/qgswfsrequest.cpp
@@ -132,6 +132,9 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres
   {
     bool success = true;
     mReply = QgsNetworkAccessManager::instance()->get( request );
+
+    Q_ASSERT( QThread::currentThread() == mReply->thread() );
+
     mReply->setReadBufferSize( READ_BUFFER_SIZE_HINT );
     if ( !mUri.auth().setAuthorizationReply( mReply ) )
     {
@@ -142,13 +145,13 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres
     }
     else
     {
-      connect( mReply, &QNetworkReply::finished, this, &QgsWfsRequest::replyFinished );
-      connect( mReply, &QNetworkReply::downloadProgress, this, &QgsWfsRequest::replyProgress );
+      connect( mReply, &QNetworkReply::finished, this, &QgsWfsRequest::replyFinished, Qt::DirectConnection );
+      connect( mReply, &QNetworkReply::downloadProgress, this, &QgsWfsRequest::replyProgress, Qt::DirectConnection );
 
       if ( synchronous )
       {
         QEventLoop loop;
-        connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit );
+        connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit, Qt::DirectConnection );
         loop.exec();
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres`
`132`	`132`	`{`
`133`	`133`	`bool success = true;`
`134`	`134`	`mReply = QgsNetworkAccessManager::instance()->get( request );`
	`135`	`+`
	`136`	`+ Q_ASSERT( QThread::currentThread() == mReply->thread() );`
	`137`	`+`
`135`	`138`	`mReply->setReadBufferSize( READ_BUFFER_SIZE_HINT );`
`136`	`139`	`if ( !mUri.auth().setAuthorizationReply( mReply ) )`
`137`	`140`	`{`
`@@ -142,13 +145,13 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres`
`142`	`145`	`}`
`143`	`146`	`else`
`144`	`147`	`{`
`145`		`- connect( mReply, &QNetworkReply::finished, this, &QgsWfsRequest::replyFinished );`
`146`		`- connect( mReply, &QNetworkReply::downloadProgress, this, &QgsWfsRequest::replyProgress );`
	`148`	`+ connect( mReply, &QNetworkReply::finished, this, &QgsWfsRequest::replyFinished, Qt::DirectConnection );`
	`149`	`+ connect( mReply, &QNetworkReply::downloadProgress, this, &QgsWfsRequest::replyProgress, Qt::DirectConnection );`
`147`	`150`
`148`	`151`	`if ( synchronous )`
`149`	`152`	`{`
`150`	`153`	`QEventLoop loop;`
`151`		`- connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit );`
	`154`	`+ connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit, Qt::DirectConnection );`
`152`	`155`	`loop.exec();`
`153`	`156`	`}`
`154`	`157`	`}`