Mercurial > hg > orthanc
diff Core/DicomNetworking/TimeoutDicomConnectionManager.cpp @ 2608:25225f0b4f33 jobs
simplification wrt. dicom connection manager
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 19 May 2018 15:50:09 +0200 |
parents | 988936118354 |
children | f7a84b551ee4 |
line wrap: on
line diff
--- a/Core/DicomNetworking/TimeoutDicomConnectionManager.cpp Sat May 19 15:28:41 2018 +0200 +++ b/Core/DicomNetworking/TimeoutDicomConnectionManager.cpp Sat May 19 15:50:09 2018 +0200 @@ -47,13 +47,15 @@ { private: TimeoutDicomConnectionManager& that_; - boost::mutex::scoped_lock lock_; public: Resource(TimeoutDicomConnectionManager& that) : - that_(that), - lock_(that.mutex_) + that_(that) { + if (that_.connection_.get() == NULL) + { + throw OrthancException(ErrorCode_InternalError); + } } ~Resource() @@ -63,11 +65,7 @@ DicomUserConnection& GetConnection() { - if (that_.connection_.get() == NULL) - { - throw OrthancException(ErrorCode_InternalError); - } - + assert(that_.connection_.get() != NULL); return *that_.connection_; } }; @@ -91,8 +89,6 @@ void TimeoutDicomConnectionManager::SetTimeout(unsigned int timeout) { - boost::mutex::scoped_lock lock(mutex_); - timeout_ = boost::posix_time::milliseconds(timeout); CheckTimeoutInternal(); } @@ -100,21 +96,18 @@ unsigned int TimeoutDicomConnectionManager::GetTimeout() { - boost::mutex::scoped_lock lock(mutex_); return timeout_.total_milliseconds(); } void TimeoutDicomConnectionManager::Close() { - boost::mutex::scoped_lock lock(mutex_); connection_.reset(NULL); } void TimeoutDicomConnectionManager::CheckTimeout() { - boost::mutex::scoped_lock lock(mutex_); CheckTimeoutInternal(); } @@ -123,8 +116,6 @@ TimeoutDicomConnectionManager::AcquireConnection(const std::string& localAet, const RemoteModalityParameters& remote) { - boost::mutex::scoped_lock lock(mutex_); - if (connection_.get() == NULL || !connection_->IsSameAssociation(localAet, remote)) {