feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Fix race condition.

Browse Source 
Change-Id: I4f52a2b604db14d088f2416989a502f91a16deab
Reviewed-on: http://codereview.qt.nokia.com/1237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Christian Kandeler
2011-07-06 14:56:58 +02:00
parent 8bddd27a2b
commit 0efdb6cde6
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/ssh/sshconnection.cpp
View File

@@ -48,6 +48,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include <QtCore/QMutexLocker>
#include <QtNetwork/QNetworkProxy> #include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QTcpSocket> #include <QtNetwork/QTcpSocket>
@@ -70,15 +71,12 @@ namespace {
void doStaticInitializationsIfNecessary() void doStaticInitializationsIfNecessary()
{ {
QMutexLocker locker(&staticInitMutex);
if (!staticInitializationsDone) { if (!staticInitializationsDone) {
staticInitMutex.lock(); Botan::LibraryInitializer::initialize("thread_safe=true");
if (!staticInitializationsDone) { qRegisterMetaType<Utils::SshError>("Utils::SshError");
Botan::LibraryInitializer::initialize("thread_safe=true"); qRegisterMetaType<Utils::SftpJobId>("Utils::SftpJobId");
qRegisterMetaType<Utils::SshError>("Utils::SshError"); staticInitializationsDone = true;
qRegisterMetaType<Utils::SftpJobId>("Utils::SftpJobId");
staticInitializationsDone = true;
}
staticInitMutex.unlock();
} }
} }
} // anonymous namespace } // anonymous namespace