diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-05 19:25:38 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-05 19:25:38 +0000 |
| commit | ae4a22a0ba748153cfc55001828b3ca828824566 (patch) | |
| tree | c2a700d87510546dad2b9986d7cdbeaba78cb65c /TAO/orbsvcs/tests/EC_Custom_Marshal | |
| parent | 2c7895ff103dd1a651a033b9a101bf375f319bd4 (diff) | |
| download | ATCD-ae4a22a0ba748153cfc55001828b3ca828824566.tar.gz | |
ChangeLogTag:Mon Mar 5 11:24:05 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Custom_Marshal')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 9c103315225..68c1c7b33cf 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -47,7 +47,9 @@ Driver::run (int argc, char* argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -114,7 +116,10 @@ Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService", + ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get the Naming Service.\n"), diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index b86af8c0a26..2651bab0e04 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -44,7 +44,8 @@ ECMS_Driver::run (int argc, char* argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -115,7 +116,8 @@ ECMS_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get the Naming Service.\n"), |