diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-05-20 19:52:04 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-05-20 19:52:04 +0000 |
| commit | ab6b7d91a0d4f27a9f1a289e7a95f653de03a248 (patch) | |
| tree | 27eea95a640587461acd87ef489615e5718a481e /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed strange Sun CC 5.5 release failure (diff) | |
| download | ice-ab6b7d91a0d4f27a9f1a289e7a95f653de03a248.tar.bz2 ice-ab6b7d91a0d4f27a9f1a289e7a95f653de03a248.tar.xz ice-ab6b7d91a0d4f27a9f1a289e7a95f653de03a248.zip | |
remove now returns the servant
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 88c175a885b..a3966c6870d 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -333,13 +333,13 @@ Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& fac return addFacet(object, ident, facet); } -void +ObjectPtr Ice::ObjectAdapterI::remove(const Identity& ident) { - removeFacet(ident, ""); + return removeFacet(ident, ""); } -void +ObjectPtr Ice::ObjectAdapterI::removeFacet(const Identity& ident, const string& facet) { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); @@ -347,7 +347,7 @@ Ice::ObjectAdapterI::removeFacet(const Identity& ident, const string& facet) checkForDeactivation(); checkIdentity(ident); - _servantManager->removeServant(ident, facet); + return _servantManager->removeServant(ident, facet); } FacetMap |