From e5c6f17ce67f71bacdc4d2a01be487907e08f8cc Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Fri, 30 Nov 2007 15:27:49 -0500
Subject: Added Properties facet to IceBox services

---
 cpp/src/IceGrid/NodeServerAdminRouter.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'cpp/src/IceGrid/NodeServerAdminRouter.cpp')

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
-- 
cgit v1.2.3