summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Time_Service
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-03-15 19:31:55 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-03-15 19:31:55 +0000
commit01cdac27d708784715b8eb19597a753d2cb6bc6c (patch)
treeb5d7b950db13bc8eb8001ac34bbcc1af56fe1ef9 /TAO/orbsvcs/Time_Service
parent4bda753b16dd33aaeab8e53c60cf132fddbe463c (diff)
downloadATCD-01cdac27d708784715b8eb19597a753d2cb6bc6c.tar.gz
ChangeLogTag: Tue Mar 15 11:25:04 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/Time_Service')
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp4
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 139ee24b9fb..14eeb987ad4 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -392,11 +392,11 @@ Clerk_i::register_clerk (void)
clerk_context_name[0].id = CORBA::string_dup ("ClerkContext");
ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ ACE_TRY_EX(bind_new_context)
{
CosNaming::NamingContext_var clerk_context =
this->naming_client_->bind_new_context(clerk_context_name);
- ACE_TRY_CHECK;
+ ACE_TRY_CHECK_EX(bind_new_context);
}
ACE_CATCH(CosNaming::NamingContext::AlreadyBound, ex)
{
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index ab107650372..0167eb90d76 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -161,11 +161,11 @@ Server_i::register_server (void)
server_context_name[0].id = CORBA::string_dup ("ServerContext");
ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ ACE_TRY_EX(bind_new_context)
{
CosNaming::NamingContext_var server_context =
this->naming_client_->bind_new_context(server_context_name);
- ACE_TRY_CHECK;
+ ACE_TRY_CHECK_EX(bind_new_context);
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
{