diff options
author | Marc Laukien <marc@zeroc.com> | 2002-09-30 17:51:43 +0000 |
---|---|---|
committer | Marc Laukien <marc@zeroc.com> | 2002-09-30 17:51:43 +0000 |
commit | e1e3c23eb93918e12ffbe031608dfbd50d68a14c (patch) | |
tree | 22056f159dfd4601a05aa298ec54ebf243428c35 /cpp/src/Ice/ObjectAdapterI.cpp | |
parent | Fixed typo in comment. (diff) | |
download | ice-e1e3c23eb93918e12ffbe031608dfbd50d68a14c.tar.bz2 ice-e1e3c23eb93918e12ffbe031608dfbd50d68a14c.tar.xz ice-e1e3c23eb93918e12ffbe031608dfbd50d68a14c.zip |
bug fixes ; added adapter deactivation tests
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 31329f20b5b..c5b41c01226 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -457,7 +457,11 @@ Ice::ObjectAdapterI::incUsageCount() { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - assert(_instance); // Must not be called after deactivation. + if(!_instance) + { + throw ObjectAdapterDeactivatedException(__FILE__, __LINE__); + } + assert(_usageCount >= 0); ++_usageCount; } |