facet path

3 files changed, 26 insertions, 2 deletions

diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index e45be7463be..ae9bc3e7959 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -47,7 +47,7 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& curr
 	
 	if(_servant && !_current.facet.empty())
 	{
-	    _facetServant = _servant->ice_findFacet(_current.facet.front());
+	    _facetServant = _servant->ice_findFacet(_current.facet);
 	    if(!_facetServant)
 	    {
 		FacetNotExistException ex(__FILE__, __LINE__);
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 62f6028595b..6b44306c703 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -100,7 +100,7 @@ IceInternal::Incoming::invoke(bool response)
 	{
 	    if(!current.facet.empty())
 	    {
-		ObjectPtr facetServant = servant->ice_findFacet(current.facet.front());
+		ObjectPtr facetServant = servant->ice_findFacet(current.facet);
 		if(!facetServant)
 		{
 		    status = DispatchFacetNotExist;
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 6f54fc4768b..7bad13a59da 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -373,6 +373,30 @@ Ice::Object::ice_findFacet(const string& name)
     }
 }
 
+ObjectPtr
+Ice::Object::ice_findFacet(const vector<string>& path, int start)
+{
+    int sz = path.size();
+
+    if(start > sz)
+    {
+	return 0;
+    }
+
+    if(start == sz)
+    {
+	return this;
+    }
+
+    ObjectPtr facet = ice_findFacet(path[start]);
+    if(!facet)
+    {
+	return 0;
+    }
+
+    return facet->ice_findFacet(path, start + 1);
+}
+
 DispatchStatus
 Ice::Blobject::__dispatch(Incoming& in, const Current& current)
 {