From 49a87f062dbd77d1d5389d486e7fb9f0e79b6fed Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Mon, 6 Feb 2017 10:42:03 +0100
Subject: Fixed ICE-7548 - getAdminProxy no longer returns 0 if synchronization
 is in progress

---
 cpp/src/IceGrid/NodeAdminRouter.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp
index fe151155eec..fe36134a2b3 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeAdminRouter.cpp
@@ -22,8 +22,10 @@ IceGrid::NodeServerAdminRouter::NodeServerAdminRouter(const NodeIPtr& node) :
 {
 }
 
-ObjectPrx
-IceGrid::NodeServerAdminRouter::getTarget(const Current& current)
+void
+IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb,
+                                                 const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams,
+                                                 const Current& current)
 {
     //
     // First, get the ServerI servant
@@ -34,7 +36,7 @@ IceGrid::NodeServerAdminRouter::getTarget(const Current& current)
     {
         throw ObjectNotExistException(__FILE__, __LINE__);
     }
-    
+
     //
     // Then get a proxy to the Process facet of the real admin object
     //
@@ -44,7 +46,7 @@ IceGrid::NodeServerAdminRouter::getTarget(const Current& current)
     {
         throw ObjectNotExistException(__FILE__, __LINE__);
     }
-    
+
     //
     // If this is a legacy Process proxy with no facet, we keep target as is
     //
@@ -56,6 +58,6 @@ IceGrid::NodeServerAdminRouter::getTarget(const Current& current)
         target = target->ice_facet(current.facet);
     }
 
-    return target;
+    invokeOnTarget(target, cb, inParams, current);
 }
 
-- 
cgit v1.2.3