diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-08-21 15:55:01 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-08-21 15:55:01 +0200 |
| commit | b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a (patch) | |
| tree | 183215e2dbeadfbc871b800ce09726e58af38b91 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | adding compression cookbook demo (diff) | |
| download | ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.bz2 ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.tar.xz ice-b9f2fa14fb3f222a6ec5e0a93bf25fe5ad12b56a.zip | |
IOCP changes, bug 3501, 4200, 4156, 3101
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 0e3f6942ffc..2e6dfa913b3 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -56,10 +56,6 @@ Ice::ObjectAdapterI::getName() const CommunicatorPtr Ice::ObjectAdapterI::getCommunicator() const { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - - checkForDeactivation(); - return _communicator; } @@ -357,7 +353,6 @@ Ice::ObjectAdapterI::destroy() // _instance = 0; _threadPool = 0; - _communicator = 0; _routerEndpoints.clear(); _routerInfo = 0; _publishedEndpoints.clear(); @@ -982,7 +977,6 @@ Ice::ObjectAdapterI::~ObjectAdapterI() { //assert(!_servantManager); // We don't clear this reference, it needs to be immutable. assert(!_threadPool); - assert(!_communicator); assert(_incomingConnectionFactories.empty()); assert(_directCount == 0); assert(!_waitForActivate); |