summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/LifeCycle_Service
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-29 08:12:23 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-29 08:12:23 +0000
commit33032faf1e1c7544a8478f24e9bf116519e02cb7 (patch)
tree9a5debea51d63d9b6032672952af0ab8b7fcd631 /TAO/orbsvcs/LifeCycle_Service
parente57c29f3d4a156eef2b55cebf5d9804b0c5791d4 (diff)
downloadATCD-33032faf1e1c7544a8478f24e9bf116519e02cb7.tar.gz
ChangeLogTag:Thu Mar 29 00:11:12 2001 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/LifeCycle_Service')
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 361f97ff360..53baeb6f90b 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -46,18 +46,25 @@ Life_Cycle_Service_Server::init (int argc,
char *argv[],
CORBA::Environment& ACE_TRY_ENV)
{
- if (this->orb_manager_.init (argc,
- argv,
- ACE_TRY_ENV) == -1)
+ int retval = 0;
+
+ retval = this->orb_manager_.init (argc,
+ argv,
+ ACE_TRY_ENV);
+ ACE_CHECK_RETURN (-1);
+
+ if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"%p\n",
"init"),
-1);
- // @@ Oh well. This should actually come before "if".
- ACE_CHECK_RETURN (-1);
+
// Activate the POA manager
- if (this->orb_manager_.activate_poa_manager (ACE_TRY_ENV) == -1)
+ retval = this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+ ACE_CHECK_RETURN (-1);
+
+ if (retval == -1)
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1);
ACE_CHECK_RETURN (-1);