diff options
| author | Joe George <joe@zeroc.com> | 2019-05-07 14:05:05 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2019-05-07 14:05:05 -0400 |
| commit | 22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35 (patch) | |
| tree | bfb5864b02158d1efc838f5d56facb65243fc555 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Dispatch queue updates (diff) | |
| download | ice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.tar.bz2 ice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.tar.xz ice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.zip | |
More dispatch queue fixes
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 102636af70d..69c25758483 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -737,8 +737,12 @@ Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints) #ifdef ICE_SWIFT dispatch_queue_t -Ice::ObjectAdapterI::getDispatchQueue() const ICE_NOEXCEPT +Ice::ObjectAdapterI::getDispatchQueue() const { + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); + + checkForDeactivation(); + return getThreadPool()->getDispatchQueue(); } #endif |