summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-05 19:25:38 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-05 19:25:38 +0000
commit5fad0769b471c5d02d480f30e5a49cc6ef3925bb (patch)
treec2a700d87510546dad2b9986d7cdbeaba78cb65c
parent048d56e9e0b69d7ab2c74151d9370715974b9baf (diff)
downloadATCD-5fad0769b471c5d02d480f30e5a49cc6ef3925bb.tar.gz
ChangeLogTag:Mon Mar 5 11:24:05 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a90
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp7
-rw-r--r--TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp5
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp9
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp5
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp9
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp10
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp8
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp10
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp8
15 files changed, 125 insertions, 58 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a6127f524cb..58c5a428131 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,13 +1,31 @@
+Mon Mar 5 11:24:05 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * orbsvcs/Event_Service/Event_Service.cpp:
+ * orbsvcs/tests/EC_Basic/EC_Basic.cpp:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+ * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+ * orbsvcs/tests/Event/Basic/Observer.cpp:
+ * orbsvcs/tests/Event/Performance/Latency.cpp:
+ * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
+ * orbsvcs/tests/Event/lib/Driver.cpp:
+ * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
+ Fixed more missing ACE_TRY_ENV in resolve_initial_references()
+
Mon Mar 5 12:55:06 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
- * examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp:
- Removed bogus files from project file list.
-
- * examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
- * examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
- Fixed some comments that were causing warnings with the Windows
- builds.
-
+ * examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp:
+ Removed bogus files from project file list.
+
+ * examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
+ * examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
+ Fixed some comments that were causing warnings with the Windows
+ builds.
+
Mon Mar 5 12:24:05 2001 Jeff Parsons <parsons@cs.wustl.edu>
* tests/IDL_Test/main.cpp:
@@ -17,8 +35,8 @@ Mon Mar 5 12:24:05 2001 Jeff Parsons <parsons@cs.wustl.edu>
Mon Mar 5 07:35:35 2001 Carlos O'Ryan <coryan@uci.edu>
- * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
- Fixed library name.
+ * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
+ Fixed library name.
Mon Mar 5 08:03:03 2001 Johnny Willemsen <jwillemsen@remedy.nl>
@@ -29,33 +47,33 @@ Mon Mar 5 08:03:03 2001 Johnny Willemsen <jwillemsen@remedy.nl>
Mon Mar 5 07:59:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>
- * tests/AMI/client.cpp:
- * tests/AMI/simple_client.cpp:
- * tests/AMI/server.cpp:
- * examples/mfc/client.cpp:
- * examples/mfc/server.cpp:
+ * tests/AMI/client.cpp:
+ * tests/AMI/simple_client.cpp:
+ * tests/AMI/server.cpp:
+ * examples/mfc/client.cpp:
+ * examples/mfc/server.cpp:
- Fixed exception handling, especially missing ACE_TRY_ENVs for
- CORBA::ORB::resolve_initial_references (). Thanks to Ossama for
- pointing this out.
+ Fixed exception handling, especially missing ACE_TRY_ENVs for
+ CORBA::ORB::resolve_initial_references (). Thanks to Ossama for
+ pointing this out.
- * examples/PluggableUDP/Diop/README:
+ * examples/PluggableUDP/Diop/README:
- Added a small paragraph about the limitations of the current
- DIOP implemenation.
- Also, added a disclaimer.
+ Added a small paragraph about the limitations of the current
+ DIOP implemenation.
+ Also, added a disclaimer.
Mon Mar 5 04:42:52 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
- * orbsvcs/tests/AVStreams/Comp_Test/ftp.h:
- * orbsvcs/tests/AVStreams/Comp_Test/ftp.cpp:
- * orbsvcs/tests/AVStreams/Comp_Test/server.h:
- * orbsvcs/tests/AVStreams/Comp_Test/server.cpp:
- * orbsvcs/tests/AVStreams/Comp_Test/README:
- * orbsvcs/tests/AVStreams/Comp_Test/run_test.pl:
+ * orbsvcs/tests/AVStreams/Comp_Test/ftp.h:
+ * orbsvcs/tests/AVStreams/Comp_Test/ftp.cpp:
+ * orbsvcs/tests/AVStreams/Comp_Test/server.h:
+ * orbsvcs/tests/AVStreams/Comp_Test/server.cpp:
+ * orbsvcs/tests/AVStreams/Comp_Test/README:
+ * orbsvcs/tests/AVStreams/Comp_Test/run_test.pl:
- Added a new test to the AVStreams tests in order to demonstrate
- the use of AVStreams Service to pace data at a specified frame rate.
+ Added a new test to the AVStreams tests in order to demonstrate
+ the use of AVStreams Service to pace data at a specified frame rate.
Mon Mar 5 01:26:42 2001 Fuzz Master D <brunsch@uci.edu>
@@ -70,7 +88,7 @@ Mon Mar 5 01:26:42 2001 Fuzz Master D <brunsch@uci.edu>
the scripts, which does not work on Windows in either the
new or old Process module).
- But anyway, I'll still use it to signifythe close to my career
+ But anyway, I'll still use it to signify the close to my career
as the the group Perl junkie. Somewhat fitting that what
started off with what I believe was a run_test script for
IDL_Cubit and its associated Process module ended with
@@ -101,12 +119,12 @@ Mon Mar 05 09:10:27 2001 Johnny Willemsen <jwillemsen@remedy.nl>
Sun Mar 04 23:00:59 2001 Ossama Othman <ossama@uci.edu>
- * tao/ORB.h (run):
+ * tao/ORB.h (run):
- Updated comments for the ORB::run() method. This method, as
- implemented by TAO, no longer returns an "int" error status (see
- Carlos' ChangeLog entry from Feb 13). The CORBA spec calls for
- a "void" return type.
+ Updated comments for the ORB::run() method. This method, as
+ implemented by TAO, no longer returns an "int" error status (see
+ Carlos' ChangeLog entry from Feb 13). The CORBA spec calls for
+ a "void" return type.
Sun Mar 04 21:43:51 2001 Carlos O'Ryan <coryan@uci.edu>
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index e2dbc619768..e86c010666f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -62,7 +62,9 @@ Event_Service::run (int argc, char* argv[])
return 1;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->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"),
@@ -80,7 +82,8 @@ Event_Service::run (int argc, char* argv[])
ACE_TRY_CHECK;
CORBA::Object_var naming_obj =
- this->orb_->resolve_initial_references ("NameService");
+ this->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 initialize the Naming Service.\n"),
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index f14db4c2f81..b0c83b7fd25 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -50,7 +50,10 @@ ECB_Driver::run (int argc, char* argv[])
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references ("RootPOA");
+ this->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"),
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"),
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 317529728fc..e7331c9ded4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -47,7 +47,10 @@ ECM_Driver::run (int argc, char* argv[])
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->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"),
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 180aa0fd098..ed85106123a 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -138,7 +138,10 @@ Test_ECG::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"),
@@ -254,7 +257,9 @@ Test_ECG::run (int argc, char* argv[])
print_priority_info ("Test_ECG::run (Main after thr_setprio)");
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_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 2e5f5fc4578..c00025a6778 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -48,7 +48,10 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->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"),
@@ -118,7 +121,10 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
}
CORBA::Object_var naming_obj =
- this->orb_->resolve_initial_references ("NameService");
+ this->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_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 061ee6f83a7..18f42f45db5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -55,7 +55,9 @@ ECT_Supplier_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"),
@@ -131,7 +133,9 @@ ECT_Supplier_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_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 333a0ab66ab..99d33d22e95 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -71,7 +71,10 @@ ECT_Throughput::run (int argc, char* argv[])
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->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"),
@@ -188,7 +191,10 @@ ECT_Throughput::run (int argc, char* argv[])
#if 0
CORBA::Object_var naming_obj =
- this->orb_->resolve_initial_references ("NameService");
+ this->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/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index d897cad75e8..03a4f7e3f3b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -167,7 +167,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[],
ACE_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+ ACE_CHECK;
+
if (CORBA::is_nil (poa_object.in ()))
{
ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index d648dde8dba..7b202b6a323 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -82,7 +82,9 @@ main (int argc, char *argv [])
#endif /* TAO_HAS_MESSAGING */
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"),
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 97c4ab93952..30b4a9709b8 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -81,7 +81,9 @@ main (int argc, char *argv [])
#endif /* TAO_HAS_MESSAGING */
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"),
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 652630cd67e..b0201c42893 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -178,7 +178,9 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
ACE_CHECK;
CORBA::Object_var poa_object =
- this->orb_->resolve_initial_references("RootPOA");
+ this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
if (CORBA::is_nil (poa_object.in ()))
{
ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index b81e127c174..beaacd0a7d1 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -865,7 +865,9 @@ main (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"),
@@ -883,7 +885,9 @@ main (int argc, char *argv [])
ACE_TRY_CHECK;
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"),