summaryrefslogtreecommitdiff
path: root/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp')
-rw-r--r--CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 71d2280ef31..545da80c14b 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -168,7 +168,7 @@ namespace CIAO
ACE_TRY_CHECK;
- if (CORBA::is_nil (poa.in ()))
+ if (poa.in () == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) CIAO_ExecutionManager: "
"Nil POA panic error, returning \n"),
@@ -189,6 +189,9 @@ namespace CIAO
daemon_servant->_this ();
TAO::Utils::Implicit_Deactivator de (daemon_servant);
+
+ ACE_TRY_CHECK;
+
bool retval = false;
if (register_with_ns_)