diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp')
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp index 13bcf6e45a2..65da583ad45 100644 --- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp +++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp @@ -172,10 +172,9 @@ main (int argc, char *argv[]) if (CORBA::is_nil (adapter.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); - - // Create and install the CIAO Daemon servant - CIAO::NodeManager_Impl *daemon_servant = 0; - ACE_NEW_RETURN (daemon_servant, + // Create and install the CIAO NodeManager servant + CIAO::NodeManager_Impl *node_manager_servant = 0; + ACE_NEW_RETURN (node_manager_servant, CIAO::NodeManager_Impl("NodeManager", orb.in (), poa.in (), @@ -183,16 +182,16 @@ main (int argc, char *argv[]) nodeapp_options_, spawn_delay), -1); - PortableServer::ServantBase_var safe_daemon (daemon_servant); + PortableServer::ServantBase_var safe_daemon (node_manager_servant); - daemon_servant->init (); + node_manager_servant->init (); // Implicit activation - CIAO::NodeManager_var daemon = - daemon_servant->_this (); + CIAO::NodeManager_var node_manager = + node_manager_servant->_this (); CORBA::String_var str = - orb->object_to_string (daemon.in () + orb->object_to_string (node_manager.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -216,7 +215,7 @@ main (int argc, char *argv[]) // Register this name with the Naming Service (void) register_with_ns (name, orb.in (), - daemon.in () + node_manager.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -231,7 +230,7 @@ main (int argc, char *argv[]) mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - // End Deployment part + // Finishing Deployment part ACE_DEBUG ((LM_DEBUG, "CIAO_NodeManager is running...\n")); |