diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-12-14 22:19:03 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-12-14 22:19:03 +0000 |
| commit | a41bb120db0ccdea5eea58e26bd30eddaff40877 (patch) | |
| tree | 955f720fb895739a61764d56234ac4a9595a1441 /cpp/src/Ice/Direct.cpp | |
| parent | some fixes (diff) | |
| download | ice-a41bb120db0ccdea5eea58e26bd30eddaff40877.tar.bz2 ice-a41bb120db0ccdea5eea58e26bd30eddaff40877.tar.xz ice-a41bb120db0ccdea5eea58e26bd30eddaff40877.zip | |
complete shutdown/deactivate re-implementation
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index 3a40175c783..59be398b3c1 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -13,7 +13,7 @@ // ********************************************************************** #include <Ice/Direct.h> -#include <Ice/ObjectAdapterI.h> // We need ObjectAdapterI, not ObjectAdapter, because of inc/decUsageCount(). +#include <Ice/ObjectAdapterI.h> // We need ObjectAdapterI, not ObjectAdapter, because of inc/decDirectCount(). #include <Ice/ServantLocator.h> #include <Ice/Reference.h> #include <Ice/Object.h> @@ -26,10 +26,10 @@ using namespace IceInternal; IceInternal::Direct::Direct(const Current& current) : _current(current) { + dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->incDirectCount(); + try { - dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->incUsageCount(); - _servant = _current.adapter->identityToServant(_current.id); if(!_servant && !_current.id.category.empty()) @@ -82,12 +82,12 @@ IceInternal::Direct::Direct(const Current& current) : } catch(...) { - dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decUsageCount(); + dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decDirectCount(); throw; } } - dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decUsageCount(); + dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decDirectCount(); throw; } } @@ -102,12 +102,12 @@ IceInternal::Direct::~Direct() } catch(...) { - dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decUsageCount(); + dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decDirectCount(); throw; } } - dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decUsageCount(); + dynamic_cast<ObjectAdapterI*>(_current.adapter.get())->decDirectCount(); } const ObjectPtr& |