diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp | 20 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Security/Send_File/server.cpp | 4 |
3 files changed, 22 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index fc901806439..7c2607e175f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Mon Mar 5 20:11:49 2001 Ossama Othman <ossama@uci.edu> + + * orbsvcs/examples/Security/Send_File/server.cpp (main): + * orbsvcs/examples/Security/SecurityLevel1/server.cpp (main): + + More missing ACE_TRY_ENV parameter fixes. + Mon Mar 5 19:32:56 2001 Ossama Othman <ossama@uci.edu> * TAO_IDL/be/be_visitor_array/any_op_cs.cpp (visit_array): diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 6ad529efcc1..f96308403d4 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -2,7 +2,9 @@ #include "SLevel1_Test_i.h" -ACE_RCSID (SecurityLevel1, server, "$Id$") +ACE_RCSID (SecurityLevel1, + server, + "$Id$") const char *ior_output_file = 0; @@ -18,7 +20,9 @@ main (int argc, char *argv[]) /// Get a reference to the RootPOA. 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"), @@ -30,16 +34,16 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; SLevel1_Server_i level1_server (); - - SLevel1_Server_var server = + + SLevel1_Server_var server = level1_server._this (ACE_TRY_ENV); ACE_TRY_CHECK; - CORBA::String_var ior = - orb->object_to_string (server.in (), + CORBA::String_var ior = + orb->object_to_string (server.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { @@ -55,7 +59,7 @@ main (int argc, char *argv[]) // Start the ORB orb->run (); - + root_poa->destroy (1, 1, ACE_TRY_ENV); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 429696fa557..b7a6d2ee3eb 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -42,7 +42,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"), |