summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2004-05-14 01:42:44 +0000
committerMichi Henning <michi@zeroc.com>2004-05-14 01:42:44 +0000
commit9cbaead9356f97d6e87a348ba7ef5addc90d27d6 (patch)
treeaba07852229882d7a9cd27cc16aa7afa53ebdc84 /cpp/src/Ice/ObjectAdapterI.cpp
parentChanged return value of ice_getFacet() to const string&. (diff)
downloadice-9cbaead9356f97d6e87a348ba7ef5addc90d27d6.tar.bz2
ice-9cbaead9356f97d6e87a348ba7ef5addc90d27d6.tar.xz
ice-9cbaead9356f97d6e87a348ba7ef5addc90d27d6.zip
Added removeAllFacets. This is a temporary check-in with trace still in the
code. For some reason, the returned facet map is corrupt. Doing a check-in here so Bernard can try this on his machine.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index c89aa3b0487..b2d03402d58 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -355,6 +355,17 @@ Ice::ObjectAdapterI::removeFacet(const Identity& ident, const string& facet)
_servantManager->removeServant(ident, facet);
}
+FacetMap
+Ice::ObjectAdapterI::removeAllFacets(const Identity& ident)
+{
+ IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+ checkForDeactivation();
+ checkIdentity(ident);
+
+ FacetMap fm = _servantManager->removeAllFacets(ident);
+}
+
ObjectPtr
Ice::ObjectAdapterI::find(const Identity& ident)
{