summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-01-02 08:30:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-01-02 08:30:00 +0000
commit6980cdc871c75482c1de410b1ac6296857e22837 (patch)
treeefb736db3da17eacc55b2c62db0d9bb91925c04c /TAO/tao
parentea6c90e2dcca40889ad46ef6f345e184d5dd369f (diff)
downloadATCD-6980cdc871c75482c1de410b1ac6296857e22837.tar.gz
ChangeLogTag: Fri Jan 2 08:29:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Utils/Server_Main.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index 2beec3dc581..1539bcf819b 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -62,7 +62,7 @@ int TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
//////////////////////////////////
// let the servant register itself
result = servant.init(orb.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ACE_TRY_CHECK;
if (result == 0)
{
@@ -84,12 +84,13 @@ int TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
ACE_Time_Value work_tv(1,0);
orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- quit = servant.idle(result ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ quit = servant.idle(result);
}
servant.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
orb->shutdown(1 ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
ACE_ERROR ((LM_INFO,
"%T %s (%P|%t) Terminated normally. %s\n", name_, servant.identity()