summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/NodeServerAdminRouter.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-11-30 15:27:49 -0500
committerBernard Normier <bernard@zeroc.com>2007-11-30 15:27:49 -0500
commite5c6f17ce67f71bacdc4d2a01be487907e08f8cc (patch)
tree1289b3dd8e93fe0e36be8ecdff2f024bb1c57271 /cpp/src/IceGrid/NodeServerAdminRouter.cpp
parentMerge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff)
downloadice-e5c6f17ce67f71bacdc4d2a01be487907e08f8cc.tar.bz2
ice-e5c6f17ce67f71bacdc4d2a01be487907e08f8cc.tar.xz
ice-e5c6f17ce67f71bacdc4d2a01be487907e08f8cc.zip
Added Properties facet to IceBox services
Diffstat (limited to 'cpp/src/IceGrid/NodeServerAdminRouter.cpp')
-rw-r--r--cpp/src/IceGrid/NodeServerAdminRouter.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.cpp b/cpp/src/IceGrid/NodeServerAdminRouter.cpp
index 62d9c5c4dcb..cb9c07be364 100644
--- a/cpp/src/IceGrid/NodeServerAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeServerAdminRouter.cpp
@@ -65,9 +65,9 @@ IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Array_Object_ice_invo
}
//
- // Then get a proxy to the real admin object
+ // Then get a proxy to the Process facet of the real admin object
//
- ObjectPrx target = server->getRealAdmin();
+ ObjectPrx target = server->getProcess();
if(target == 0)
{
@@ -75,9 +75,15 @@ IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Array_Object_ice_invo
}
//
- // Set the facet
+ // If this is a legacy Process proxy with no facet, we keep target as is
//
- target = target->ice_facet(current.facet);
+ if(current.facet != "Process")
+ {
+ //
+ // Set the facet
+ //
+ target = target->ice_facet(current.facet);
+ }
//
// Call with AMI