ChangeLogTag: Wed Jan 24 18:25:26 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

35 files changed, 82 insertions, 50 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index eff3b17de98..97c67936043 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,43 @@
+Wed Jan 24 18:25:26 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Messaging.cpp:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/Policy_Creator_T.h:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/PortableServer/poa_macros.h:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/Utils/Server_Main.cpp:
+
+          The first run of my macro removal script picked up a few things to
+          remove.  I'll be running this script on the rest of the tree soon.
+
 Wed Jan 24 14:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/IDL_Test/struct.idl:
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 339d705792d..cba55b4c268 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -55,7 +55,7 @@ TAO_BiDirGIOP_Loader::init (int,
         {
           if (TAO_debug_level > 0)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+              ACE_PRINT_EXCEPTION (ex,
                                    "Caught exception:");
             }
           return -1;
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 5fdf7a56599..def6fc8b362 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -93,7 +93,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch
               !this->request_->deferred_reply())
         {
           // The request is a remote request that is expecting a reply.
-          this->request_->tao_send_reply_exception(ACE_ANY_EXCEPTION);
+          this->request_->tao_send_reply_exception(ex);
         }
       else if (TAO_debug_level > 0)
         {
@@ -108,7 +108,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch
                       ACE_TEXT ("but client is not waiting a response\n")));
 
           ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
+              ex,
               "FW_Server_Request_Wrapper::dispatch ()");
         }
      }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index 128db5dd76d..4afb762975f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -29,7 +29,7 @@ TAO::CSD::TP_Collocated_Synch_Request::dispatch_i()
   catch ( ::CORBA::Exception& ex)
     {
       // We need to save off a copy of the exception.
-      this->exception_ = ACE_ANY_EXCEPTION._tao_duplicate();
+      this->exception_ = ex._tao_duplicate();
     }
   catch (...)
     {
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index c7697dc7c15..fea436fdbc8 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -90,7 +90,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Exception during reply handler");
         }
     }
@@ -128,7 +128,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
       if (TAO_debug_level >= 4)
         {
           ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
+              ex,
               "DII_Deferred_Reply_Dispacher::connection_closed"
             );
         }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index 7b0b4107087..8c086788eae 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -42,7 +42,7 @@ TAO_EndpointPolicy_Initializer::init (void)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Caught exception:");
         }
       return -1;
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 8ac7a0a501b..309af68f6ba 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -106,7 +106,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
                               ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
                 }
 
-              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
+              ACE_PRINT_TAO_EXCEPTION (ex,
                                        "Ignoring exception in "
                                        "IORInterceptor::establish_components");
             }
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 7509cc31dcf..219d69b69ae 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -192,7 +192,7 @@ namespace TAO
         }
       catch ( ::CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "ImR_Client_Adapter_Impl::imr_notify_shutdown()");
           // Ignore exceptions
         }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 6734704c028..2dbb1628cd6 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -150,7 +150,7 @@ namespace TAO
       {
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION);
+          this->handle_any_exception (&ex);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index e6273d30a3a..04712dc4ff8 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -132,7 +132,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
       catch ( ::CORBA::Exception& ex)
         {
           if (TAO_debug_level >= 4)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+            ACE_PRINT_EXCEPTION (ex,
                                  "Exception during reply handler");
         }
     }
@@ -182,7 +182,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Asynch_Reply_Dispacher::connection_closed");
         }
 
@@ -240,7 +240,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Asynch_Reply_Dispacher::reply_timed_out");
         }
 
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 8380851f05b..8fe54a1426b 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -73,7 +73,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
 
       // Raise the exception.
       ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exception);
-      ACE_ENV_RAISE (exception);
+      exception->_raise ();
 
       return;
     }
@@ -95,7 +95,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
 
       // Raise the exception.
       ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception);
-      ACE_ENV_RAISE (exception);
+      exception->_raise ();
 
       return;
     }
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index 3b2dc178316..7f2ff911244 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -58,7 +58,7 @@ TAO_Messaging_Loader::init (int,
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Caught exception:");
         }
       return -1;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 1960ccc15d6..36f3ab53c1b 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -3218,7 +3218,6 @@ TAO_ORB_Core::get_cached_policy_including_current (
   CORBA::Policy_var result =
     policy_current.get_cached_policy (type
                                      );
-  ACE_CHECK (CORBA::Policy::_nil ());
 
   if (CORBA::is_nil (result.in ()))
     {
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 4d903c3ef9c..53b77a2cf6b 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -162,7 +162,7 @@ namespace TAO
         // drops to zero, i.e., once each interceptor has been invoked.
         // This prevents infinite recursion from occuring.
 
-        invocation.exception (&ACE_ANY_EXCEPTION);
+        invocation.exception (&ex);
 
         this->receive_exception (invocation);
 
@@ -233,7 +233,7 @@ namespace TAO
         // drops to zero, i.e., once each interceptor has been invoked.
         // This prevents infinite recursion from occuring.
 
-        invocation.exception (&ACE_ANY_EXCEPTION);
+        invocation.exception (&ex);
 
         this->receive_exception (invocation);
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index f47bc2ada8f..3fc1938dc89 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -63,7 +63,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "(%P|%t) Caught exception:");
         }
       return -1;
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 7035d1aa465..cf87f7f623c 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -56,7 +56,7 @@ TAO_PI_Init::Initializer (void)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "(%P | %t) Caught exception:");
         }
       return -1;
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index 46f8afebce5..dfe55c526cc 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -60,7 +60,7 @@ TAO_PI_Server_Loader::init (int,
     }
   catch ( ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h
index 0a38c59d9e4..23ce59f29a3 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -35,7 +35,7 @@ namespace TAO
         )
     {
       if ((val >>= value) == 0)
-        ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE));
+        throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
       ACE_NEW_THROW_EX (policy,
                         POLICYTYPE (value),
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 27de9bb2643..057d604fca8 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -432,7 +432,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
       // drops to zero, i.e., once each interceptor has been invoked.
       // This prevents infinite recursion from occuring.
 
-      server_request.caught_exception (&ACE_ANY_EXCEPTION);
+      server_request.caught_exception (&ex);
 
       this->send_exception (server_request,
                             args,
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index 06a3422e1eb..29f252fd5a5 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -76,7 +76,7 @@ namespace TAO
               catch ( ::CORBA::Exception& ex)
                 {
                   // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                  ACE_PRINT_EXCEPTION (ex,
                                        "TAO_POA::complete_destruction_i");
                 }
             }
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index f51d64f3313..8b124ae693f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -862,7 +862,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
 
       if (sri_adapter != 0)
         {
-          request.caught_exception (&ACE_ANY_EXCEPTION);
+          request.caught_exception (&ex);
 
           sri_adapter->send_exception (request,
                                        0,  // args
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index b5b8dec77d9..c827778e59b 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -2440,7 +2440,7 @@ TAO_Root_POA::ORT_adapter_i (void)
     }
   catch ( ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "(%P|%t) Cannot initialize the "
                            "object_reference_template_adapter\n");
     }
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 9a7cca01954..04a17128a00 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -265,7 +265,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
               throw;
             }
           else
-            req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
+            req.tao_send_reply_exception (ex);
         }
     }
 
@@ -321,7 +321,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
     {
       // If an exception was raised we should marshal it and send
       // the appropriate reply to the client
-      req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
+      req.tao_send_reply_exception (ex);
     }
 
   return;
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index e63f969a83f..fa8097c116e 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -439,7 +439,7 @@ namespace TAO
               catch ( ::CORBA::Exception& ex)
                 {
                   // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                  ACE_PRINT_EXCEPTION (ex,
                                        "TAO_POA::~complete_destruction_i");
                 }
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 48f41e8afe8..076911b755e 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -123,7 +123,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
               {
                 // The actual upcall.
                 command.execute ();
-                TAO_INTERCEPTOR_CHECK;
               }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -170,7 +169,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       PortableInterceptor::ReplyStatus status =
         PortableInterceptor::SYSTEM_EXCEPTION;
 
-      server_request.caught_exception (&ACE_ANY_EXCEPTION);
+      server_request.caught_exception (&ex);
 
       if (interceptor_adapter != 0)
         {
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index 4344caa12c1..86da46eaefb 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -18,25 +18,21 @@
   ACE_GUARD_THROW_EX (ACE_Lock, \
                       monitor, \
                       this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK
+                      CORBA::OBJ_ADAPTER ())
 
 #define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \
   ACE_GUARD_THROW_EX (ACE_Lock, \
                       monitor, \
                       this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
+                      CORBA::OBJ_ADAPTER ())
 
 #define TAO_POA_GUARD \
   TAO::Portable_Server::POA_Guard poa_guard (*this); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK
+  ACE_UNUSED_ARG (poa_guard)
 
 #define TAO_POA_GUARD_RETURN(RETURN) \
   TAO::Portable_Server::POA_Guard poa_guard (*this); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK_RETURN (RETURN)
+  ACE_UNUSED_ARG (poa_guard)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index faba49d63c8..2b47ce29331 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -180,7 +180,7 @@ TAO_RT_ORB_Loader::init (int argc,
     }
   catch ( ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unexpected exception caught while "
                            "initializing the RTORB");
       return 1;
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 5a7db421e33..5bbe425196f 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -494,7 +494,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "TAO_RT_Protocols_Hooks::get_dscp_codepoint");
         }
 
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index c57a764b00a..5d6b3193cac 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -67,7 +67,7 @@ TAO_Thread_Pool_Threads::svc (void)
       ACE_ERROR ((LM_ERROR,
                   "orb->run() raised exception for thread %t\n"));
 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "");
     }
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index ea6c55bd2ba..e9da937565d 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -357,7 +357,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
       catch ( ::CORBA::Exception& ex)
         {
           // Eat up the exception.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                "Exception caught: TAO - "
                                "Priority_Model_Processing::"
                                "~Priority_Model_Processing");
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 96262df1996..769d2759a2a 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -641,7 +641,7 @@ DTTask::svc (void)
     }
   catch ( ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Caught exception:");
       return -1;
     }
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index bef5e1f7510..996c9985d10 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -58,7 +58,7 @@ TAO_RTScheduler_Loader::init (int,
     }
   catch ( ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Unexpected exception caught while initializing the RTScheduler:");
       return 1;
     }
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index f20309ce1de..7630447ac0d 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -437,7 +437,6 @@ TAO_Stub::get_policy (CORBA::PolicyType type
       result =
         this->policies_->get_policy (type
                                     );
-      ACE_CHECK (CORBA::Policy::_nil ());
     }
 
   if (CORBA::is_nil (result.in ()))
@@ -445,7 +444,6 @@ TAO_Stub::get_policy (CORBA::PolicyType type
       result =
         this->orb_core_->get_policy_including_current (type
                                                       );
-      ACE_CHECK (CORBA::Policy::_nil ());
     }
 
   return result._retn ();
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 89ef71d6365..af7f0f7cf86 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -639,7 +639,7 @@ namespace TAO
     mon.set_status (TAO_INVOKE_SYSTEM_EXCEPTION);
 
     // Raise the exception.
-    ACE_ENV_RAISE (ex);
+    ex->_raise ();
 
     return TAO_INVOKE_SYSTEM_EXCEPTION;
   }
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index 43dba960a5a..c67d99f772d 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -115,7 +115,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
   }
   catch ( ::CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+    ACE_PRINT_EXCEPTION (ex,
       name_);
     result = -1;
   }