diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp')
| -rw-r--r-- | TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp index 365cbb12e04..86c1fc1e5d3 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp @@ -211,7 +211,7 @@ namespace CIAO ACE_DEBUG ((LM_ERROR, "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::perform_redeployment -" - "Invalid plan uuid: %s!\n", plan.UUID.in ())); + "Invalid plan uuid: %s\n", plan.UUID.in ())); ACE_THROW (Deployment::PlanError ( "Execution_Manager_Impl::perform_redeployment", "Invalid plan uuid specified.")); @@ -247,7 +247,7 @@ namespace CIAO ACE_DEBUG ((LM_ERROR, "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::getPlan -" - "Invalid plan uuid: %s!\n", plan_uuid)); + "Invalid plan uuid: %s\n", plan_uuid)); ACE_THROW (::CORBA::BAD_PARAM ()); } @@ -273,6 +273,9 @@ namespace CIAO ::CORBA::SystemException, ::Deployment::InvalidConnection)) { + ACE_DEBUG ((LM_ERROR, + "Execution_Manage::finalizing global bindings.\n")); + // Find the NodeApplication hosting the component, and then call // <finishLaunch> on it ACE_TRY @@ -280,6 +283,14 @@ namespace CIAO Deployment::NodeApplication_var node_app = this->find_node_application (binding); + if (CORBA::is_nil (node_app.in ())) + { + ACE_DEBUG ((LM_ERROR, + "Execution_Manager_Impl::finalize_global_binding - " + "nil NodeApplication object reference.\n")); + ACE_THROW (Deployment::InvalidConnection ()); + } + node_app->finishLaunch (binding.providedReference_.in (), true, // start true); // add_connection @@ -310,7 +321,7 @@ namespace CIAO ACE_DEBUG ((LM_ERROR, "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::find_node_application -" - "Invalid plan uuid: %s!\n", binding.plan_uuid_.c_str ())); + "Invalid plan uuid: %s\n", binding.plan_uuid_.c_str ())); ACE_THROW (::CORBA::BAD_PARAM ()); } |