ChangeLogTag: Thu Sep 22 08:21:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

18 files changed, 103 insertions, 102 deletions

diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 051ef1b2124..287be59afe8 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -188,17 +188,22 @@ Server_i::create_poa (const char *name,
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN
-           ACE_ENV_ARG_PARAMETER);
+        {
+          policies_[3] =
+            root_poa_->create_servant_retention_policy
+            (PortableServer::RETAIN
+             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
       if (servant_retention_policy == 0)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN
-           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        {
+          policies_[3] =
+            root_poa_->create_servant_retention_policy
+            (PortableServer::NON_RETAIN
+             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
       // Create myPOA as the child of RootPOA with the above
       // policies_. myPOA will use SERVANT_ACTIVATOR or
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index ad08f3fd7a9..b72bed11b55 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -16,7 +16,7 @@
 
 #include "Factory_Finder.h"
 
-ACE_RCSID (Quoter, 
+ACE_RCSID (Quoter,
 
            Factory_Finder, "$Id$")
 
@@ -57,14 +57,16 @@ Quoter_Factory_Finder_Server::init (int argc,
   ACE_TRY
     {
       exception_message = "While ORB_Manager::init";
-      if (this->orb_manager_.init (argc,
-                                   argv
-                                   ACE_ENV_ARG_PARAMETER) == -1)
+      int initvalue = this->orb_manager_.init (argc,
+                                               argv
+                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (initvalue == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init"),
                           -1);
-      ACE_TRY_CHECK;
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 97a4e3fcda0..5973b0caedc 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -66,10 +66,10 @@ TAO_Codeset_Manager_i::TAO_Codeset_Manager_i ()
     wchar_descriptor_ ()
 {
   char_descriptor_.ncs(TAO_Codeset_Manager_i::default_char_codeset);
-  char_descriptor_.add_translator ("UTF8_Latin1_Factory");
+  char_descriptor_.add_translator (ACE_TEXT ("UTF8_Latin1_Factory"));
 
   wchar_descriptor_.ncs(TAO_Codeset_Manager_i::default_wchar_codeset);
-  wchar_descriptor_.add_translator ("UTF16_BOM_Factory");
+  wchar_descriptor_.add_translator (ACE_TEXT ("UTF16_BOM_Factory"));
 }
 
 TAO_Codeset_Manager_i::~TAO_Codeset_Manager_i ()
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index a78ad315d52..6643a51b990 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -275,7 +275,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_AlreadyRegistered = 0;
 static TAO::TypeCode::Struct<char const *,
@@ -421,7 +421,7 @@ ImplementationRepository::CannotActivate::CannotActivate (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
   {
@@ -553,7 +553,7 @@ void ImplementationRepository::NotFound::_tao_decode (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_NotFound = 0;
 static TAO::TypeCode::Struct<char const *,
@@ -576,7 +576,7 @@ namespace ImplementationRepository
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_EnvironmentVariable[] =
   {
@@ -747,7 +747,7 @@ namespace ImplementationRepository
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 
 
@@ -797,7 +797,7 @@ ImplementationRepository::StartupOptions::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
+// be\be_visitor_typecode/struct_typecode.cpp:89
 
 static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_ServerInformation[] =
   {
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index f72b14fc1e2..137f4f1e20e 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_IMPLREPOC_H_
-#define _TAO_IDL_IMPLREPOC_H_
+#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
+#define _TAO_IDL_ORIG_IMPLREPOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -112,9 +112,6 @@ namespace ImplementationRepository
         ACE_ENV_ARG_DECL
       );
     
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
@@ -170,9 +167,6 @@ namespace ImplementationRepository
         const char * _tao_reason
       );
     
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
@@ -220,9 +214,6 @@ namespace ImplementationRepository
         ACE_ENV_ARG_DECL
       );
     
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
     virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
   
@@ -468,7 +459,7 @@ namespace ImplementationRepository
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
@@ -600,7 +591,7 @@ namespace ImplementationRepository
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index e53d7e95a40..7f2910a0dbf 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -29,8 +29,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:553
 
-#ifndef _TAO_IDL_IMPLREPOS_CPP_
-#define _TAO_IDL_IMPLREPOS_CPP_
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
+#define _TAO_IDL_ORIG_IMPLREPOS_CPP_
 
 
 #include "ImplRepoS.h"
@@ -288,7 +288,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1465
+// be\be_interface.cpp:1513
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -467,7 +467,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:921
+// be\be_visitor_interface/interface_ss.cpp:924
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
@@ -612,13 +612,12 @@ namespace POA_ImplementationRepository
           this->args_,
           2);
         
-      
       retval =
         this->servant_->next_n (
           arg_1
           , arg_2
           ACE_ENV_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -703,7 +702,7 @@ namespace POA_ImplementationRepository
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -797,12 +796,11 @@ namespace POA_ImplementationRepository
           this->args_,
           1);
         
-      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -888,11 +886,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -976,11 +973,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -1112,11 +1108,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -1243,7 +1238,7 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1465
+// be\be_interface.cpp:1513
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1430,7 +1425,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:921
+// be\be_visitor_interface/interface_ss.cpp:924
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
@@ -1734,7 +1729,7 @@ namespace POA_ImplementationRepository
       this->servant_->activate_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -1839,7 +1834,7 @@ namespace POA_ImplementationRepository
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -1938,7 +1933,7 @@ namespace POA_ImplementationRepository
       this->servant_->remove_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2035,7 +2030,7 @@ namespace POA_ImplementationRepository
       this->servant_->shutdown_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2146,7 +2141,7 @@ namespace POA_ImplementationRepository
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2247,7 +2242,7 @@ namespace POA_ImplementationRepository
       this->servant_->server_is_shutting_down (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2351,7 +2346,7 @@ namespace POA_ImplementationRepository
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2461,7 +2456,7 @@ namespace POA_ImplementationRepository
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2566,7 +2561,7 @@ namespace POA_ImplementationRepository
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -2668,12 +2663,11 @@ namespace POA_ImplementationRepository
           this->args_,
           1);
         
-      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -2759,11 +2753,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -2847,11 +2840,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -2983,11 +2975,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h
index 8e74c1bb9ee..826a4ce7455 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:373
 
-#ifndef _TAO_IDL_IMPLREPOS_H_
-#define _TAO_IDL_IMPLREPOS_H_
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
+#define _TAO_IDL_ORIG_IMPLREPOS_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
index ade33a21dee..7cdd3ddebc6 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.h
+++ b/TAO/tao/ImR_Client/ServerObjectC.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_SERVEROBJECTC_H_
-#define _TAO_IDL_SERVEROBJECTC_H_
+#ifndef _TAO_IDL_ORIG_SERVEROBJECTC_H_
+#define _TAO_IDL_ORIG_SERVEROBJECTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -69,7 +69,7 @@ namespace ImplementationRepository
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // be\be_interface.cpp:646
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 97c94785b4b..e85dff9426d 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -29,8 +29,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:553
 
-#ifndef _TAO_IDL_SERVEROBJECTS_CPP_
-#define _TAO_IDL_SERVEROBJECTS_CPP_
+#ifndef _TAO_IDL_ORIG_SERVEROBJECTS_CPP_
+#define _TAO_IDL_ORIG_SERVEROBJECTS_CPP_
 
 
 #include "ServerObjectS.h"
@@ -81,7 +81,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1465
+// be\be_interface.cpp:1513
 
 class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -261,7 +261,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:921
+// be\be_visitor_interface/interface_ss.cpp:924
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
@@ -384,7 +384,7 @@ namespace POA_ImplementationRepository
     {
       this->servant_->ping (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -461,7 +461,7 @@ namespace POA_ImplementationRepository
     {
       this->servant_->shutdown (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+      ACE_CHECK;
     }
   
   private:
@@ -555,12 +555,11 @@ namespace POA_ImplementationRepository
           this->args_,
           1);
         
-      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -646,11 +645,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -734,11 +732,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _repository_id (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
@@ -870,11 +867,10 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_);
       
-      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+      ACE_CHECK;
     }
   
   private:
diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h
index f62b63a8dc3..f9f7c790be4 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.h
+++ b/TAO/tao/ImR_Client/ServerObjectS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:373
 
-#ifndef _TAO_IDL_SERVEROBJECTS_H_
-#define _TAO_IDL_SERVEROBJECTS_H_
+#ifndef _TAO_IDL_ORIG_SERVEROBJECTS_H_
+#define _TAO_IDL_ORIG_SERVEROBJECTS_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 1857737deaf..e0ee81f34e2 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -64,6 +64,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
   orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   // Validate that all of the specified policies make sense.
   validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index cc6a7fd44f6..fa9ba6014e4 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -67,7 +67,10 @@ ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
 TAO_Root_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
+  TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (adapter)
     {
       return this->ort_adapter_->get_obj_ref_factory();
     }
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index e2ba9d73254..2f9e0637f19 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -37,7 +37,7 @@ ACE_RCSID (RTCORBA,
 #include "ace/Sched_Params.h"
 
 static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory";
-static const char *rt_poa_factory_directive =
+static const ACE_TCHAR *rt_poa_factory_directive =
   ACE_DYNAMIC_SERVICE_DIRECTIVE(
     "TAO_RT_Object_Adapter_Factory",
     "TAO_RTPortableServer",
@@ -85,7 +85,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   // If the application resolves the root POA, make sure we load the RT POA.
   TAO_ORB_Core::set_poa_factory (rt_poa_factory_name,
-                                 rt_poa_factory_directive);
+                                 ACE_TEXT_ALWAYS_CHAR (rt_poa_factory_directive));
 
   // Create the initial priority mapping instance.
   TAO_Priority_Mapping *pm = 0;
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index ec797de5978..ade35e5e386 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -59,8 +59,9 @@ main (int argc, char *argv[])
       for (int i = 0; i < num_calls; i++)
         {
           roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
-          ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
           ACE_TRY_CHECK;
+
+          ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index b8f50d689b0..d0de0aad007 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -225,6 +225,7 @@ main (int argc, char **argv)
 
       test_reference_to_servant_active_object(root_poa.in ()
                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       // Test servant.
       test_i test;
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
index db8bd034810..a87b61b1875 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
@@ -10,3 +10,4 @@ project(Thread_Cancel) : rtscheduling_client {
 
   exename = Thread_Cancel
 }
+
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index c2288510263..4b806351df6 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -53,13 +53,14 @@ main (int argc, char* argv [])
       ACE_TRY_CHECK;
 
       for (int i = 0; i < 4; i++)
-	{
-	  RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]
-								      ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
-
-	  DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER);
-	}
+        {
+          RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]
+                            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
       orb->run ();
 
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index ddd6ac33365..48add17f564 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -148,14 +148,22 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
       // This needs to be bounded by a try/catch
       CORBA::Object_var the_context = root_nc->resolve (the_name ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
+      ACE_TRY_CHECK;
 
       if (destroy_after_unbind)
         {
           CosNaming::NamingContext_var nc =
             CosNaming::NamingContext::_narrow (the_context.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
           if (! CORBA::is_nil(nc.in()))
-            nc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+            {
+              nc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
         }
 
       ACE_TRY_CHECK;