summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionMonitor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ConnectionMonitor.cpp')
-rw-r--r--cpp/src/Ice/ConnectionMonitor.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/cpp/src/Ice/ConnectionMonitor.cpp b/cpp/src/Ice/ConnectionMonitor.cpp
index 6e8cd714b46..1f71250f72f 100644
--- a/cpp/src/Ice/ConnectionMonitor.cpp
+++ b/cpp/src/Ice/ConnectionMonitor.cpp
@@ -31,10 +31,7 @@ IceInternal::ConnectionMonitor::destroy()
{
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
- if(!_instance)
- {
- return;
- }
+ assert(_instance);
_instance = 0;
_connections.clear();
@@ -49,12 +46,7 @@ void
IceInternal::ConnectionMonitor::add(const ConnectionPtr& connection)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
- if(!_instance)
- {
- throw CommunicatorDestroyedException(__FILE__, __LINE__);
- }
-
+ assert(_instance);
_connections.insert(connection);
}
@@ -62,12 +54,7 @@ void
IceInternal::ConnectionMonitor::remove(const ConnectionPtr& connection)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
- if(!_instance)
- {
- throw CommunicatorDestroyedException(__FILE__, __LINE__);
- }
-
+ assert(_instance);
_connections.erase(connection);
}