[Pkg-owncloud-commits] [owncloud-client] 12/84: Revert "Fix a deadlock when shutting down during discovery" (#5100)

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit b307f2b65c9fa94ee917e4b34ed7a4c19ed99793
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Wed Aug 3 16:35:24 2016 +0200

    Revert "Fix a deadlock when shutting down during discovery" (#5100)
    
    Reverts commit 622017adcf3b1a914221acc0bb2c17e1429ea4c3
    
    Could be the cause of #5092 and the cost is higher than the benefit if this is the case.
    A network request taking more than 30 seconds isn't something unlikely in this world
    and shouldn't be a good reason to abort. We should try to untangle the threads
    dependencies to properly fix this if possible instead.
---
 src/libsync/discoveryphase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 52a454e..c85fe2d 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -564,7 +564,7 @@ csync_vio_handle_t* DiscoveryJob::remote_vio_opendir_hook (const char *url,
         discoveryJob->_vioMutex.lock();
         const QString qurl = QString::fromUtf8(url);
         emit discoveryJob->doOpendirSignal(qurl, directoryResult.data());
-        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, 30000);
+        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, ULONG_MAX); // FIXME timeout?
         discoveryJob->_vioMutex.unlock();
 
         qDebug() << discoveryJob << url << "...Returned from main thread";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git