Fixed ICE-7548 - getAdminProxy no longer returns 0 if synchronization is in progress

1 files changed, 9 insertions, 9 deletions

diff --git a/cpp/src/IceGrid/AdminRouter.cpp b/cpp/src/IceGrid/AdminRouter.cpp
index 22c6bab1535..380521140dc 100644
--- a/cpp/src/IceGrid/AdminRouter.cpp
+++ b/cpp/src/IceGrid/AdminRouter.cpp
@@ -28,13 +28,13 @@ public:
     {
         _cb->ice_response(ok, outParams);
     }
-    
+
     void exception(const Ice::Exception&)
     {
         // Admin object is unreachable
         _cb->ice_exception(ObjectNotExistException(__FILE__, __LINE__));
     }
-    
+
 private:
     AMD_Object_ice_invokePtr _cb;
 };
@@ -42,19 +42,19 @@ private:
 }
 
 void
-IceGrid::AdminRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, 
-                                       const pair<const Byte*, const Byte*>& inParams,
-                                       const Current& current)
+IceGrid::AdminRouter::invokeOnTarget(const Ice::ObjectPrx& target,
+                                     const AMD_Object_ice_invokePtr& cb,
+                                     const pair<const Byte*, const Byte*>& inParams,
+                                     const Current& current)
 {
-    ObjectPrx target = getTarget(current);
     assert(target != 0);
 
     //
     // Call with AMI
     //
-    Callback_Object_ice_invokePtr amiCb = 
-        newCallback_Object_ice_invoke(new CallbackI(cb), &CallbackI::response, &CallbackI::exception);
-
+    Callback_Object_ice_invokePtr amiCb = newCallback_Object_ice_invoke(new CallbackI(cb),
+                                                                        &CallbackI::response,
+                                                                        &CallbackI::exception);
     target->begin_ice_invoke(current.operation, current.mode, inParams, current.ctx, amiCb);
 }