Catch exceptions as const

* CIAO/ciao/Containers/Container_Base_T.cpp: * CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp: * CIAO/ciao/Deployment/Handlers/Home_Handler.cpp: * CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp: * CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: * CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp: * CIAO/performance-tests/Protocols/Controller/Controller.cpp: * CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp: * CIAO/tests/DAnCE/Components/Progressive_exec.cpp: * CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp: * CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp: * CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp: * DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp: * DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp: * DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp: * DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp: * DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp: * DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp: * DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp: * DAnCE/dance/RepositoryManager/repository_manager_admin.cpp: * DAnCE/dance/TargetManager/DomainDataManager.cpp: * DAnCE/dance/TargetManager/Target_Manager_Module.cpp: * DAnCE/tests/TargetManager/CmpClient.cpp: * DAnCE/tools/Config_Handlers/Any_Handler.cpp: * DAnCE/tools/Config_Handlers/XML_File_Intf.cpp: * DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp: * TAO/docs/tutorials/Quoter/AMI/client.cpp: * TAO/docs/tutorials/Quoter/AMI/server.cpp: * TAO/docs/tutorials/Quoter/Event_Service/client.cpp: * TAO/docs/tutorials/Quoter/Event_Service/server.cpp: * TAO/docs/tutorials/Quoter/Naming_Service/client.cpp: * TAO/docs/tutorials/Quoter/Naming_Service/server.cpp: * TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp: * TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp: * TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html: * TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp: * TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp: * TAO/docs/tutorials/Quoter/Simple/Client/client.cpp: * TAO/docs/tutorials/Quoter/Simple/Client/index.html: * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp: * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp: * TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp: * TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp: * TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp: * TAO/docs/tutorials/Quoter/Simple/Server/index.html: * TAO/docs/tutorials/Quoter/Simple/Server/server.cpp: * TAO/examples/Borland/ChatClient.cpp: * TAO/examples/Borland/ChatClientWnd.cpp: * TAO/examples/Borland/ORBThread.cpp: * TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp: * TAO/orbsvcs/IFR_Service/be_produce.cpp: * TAO/orbsvcs/Notify_Service/Notify_Service.cpp: * TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp: * TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp: * TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp: * TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp: * TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp: * TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp: * TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp: * TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp: * TAO/orbsvcs/examples/ORT/Gateway_i.cpp: * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: * TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp: * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp: * TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp: * TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp: * TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp: * TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: * TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp: * TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp: * TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp: * TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp: * TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: * TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp: * TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp: * TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp: * TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: * TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp: * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp: * TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp: * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: * TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp: * TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp: * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp: * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp: * TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp: * TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp: * TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: * TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp: * TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp: * TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp: * TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp: * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h: * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp: * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp: * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp: * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h: * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp: * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp: * TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp: * TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp: * TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp: * TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp: * TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp: * TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp: * TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp: * TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp: * TAO/tao/IORTable/Async_IOR_Table_Impl.cpp: * TAO/tests/Bug_2241_Regression/Client_Task.cpp: * TAO/tests/Bug_2345_Regression/server.cpp: * TAO/tests/Bug_2494_Regression/client.cpp: * TAO/tests/Bug_2494_Regression/server.cpp: * TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp: * TAO/tests/Bug_2560_Regression/client.cpp: * TAO/tests/Bug_2560_Regression/server.cpp: * TAO/tests/Bug_2654_Regression/client.cpp: * TAO/tests/Bug_2683_Regression/client.cpp: * TAO/tests/Bug_2683_Regression/server.cpp: * TAO/tests/Bug_2809_Regression/server.cpp: * TAO/tests/Bug_3068_Regression/client.cpp: * TAO/tests/Bug_3068_Regression/server.cpp: * TAO/tests/Bug_3068_Regression/test_i.cpp: * TAO/tests/Bug_3276_Regression/client.cpp: * TAO/tests/Bug_3531_Regression/client.cpp: * TAO/tests/Bug_3531_Regression/server.cpp: * TAO/tests/Bug_3531b_Regression/server.cpp: * TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp: * TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp: * TAO/tests/Bug_3755_Ext_Regression/common.cpp: * TAO/tests/Bug_3755_Regression/server.cpp: * TAO/tests/Bug_3826_Regression/server.cpp: * TAO/tests/Bug_933_Regression/Messenger_i.cpp: * TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp: * TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp: * TAO/tests/CollocationLockup/CollocationLockup.cpp: * TAO/tests/CollocationLockup/SimpleNamingService.cpp: * TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp: * TAO/tests/DII_AMI_Forward/client.cpp: * TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp: * TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp: * TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp: * TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp: * TAO/tests/MT_NoUpcall_Connect/client.cpp: * TAO/tests/Native_Exceptions/client.cpp: * TAO/tests/Native_Exceptions/server.cpp: * TAO/tests/Oneway_Send_Timeouts/Client.cpp: * TAO/tests/Oneway_Timeouts/client.cpp: * TAO/tests/Oneway_Timeouts/server.cpp: * TAO/tests/POA/EndpointPolicy/server.cpp: * TAO/tests/POA/Persistent_ID/client.cpp: * TAO/tests/Param_Test/except.cpp: * TAO/tests/Storable/test.cpp: * TAO/tests/UNKNOWN_Exception/client.cpp: * TAO/utils/monitor/monitor_client.cpp:
author: Johnny Willemsen <jwillemsen@remedy.nl> 2014-12-11 14:26:56 +0100
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2014-12-11 14:26:56 +0100
commit: 39668e74d887084a2295d7cf3d445e7c42d7704e (patch)
tree: 32b3862b94313e8abc5a7a2b45d8b6bced090426
parent: cce2446f02f2e85d78067ff696b5d2c212de3ad4 (diff)
download: ATCD-39668e74d887084a2295d7cf3d445e7c42d7704e.tar.gz
165 files changed, 276 insertions, 276 deletions
diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp
index 9781aba36cf..394b3a5936a 100644
--- a/CIAO/ciao/Containers/Container_Base_T.cpp
+++ b/CIAO/ciao/Containers/Container_Base_T.cpp
@@ -577,7 +577,7 @@ namespace CIAO
               PortableServer::POA::_duplicate(this->component_poa_.in ());
             svt = poa_safe->reference_to_servant (compref);
           }
-        catch (CORBA::Exception &ex)
+        catch (const CORBA::Exception &ex)
           {
             std::ostringstream err;
             err << "Internal Container Error: "
diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
index e21c22ccb29..1b8ff0330d9 100644
--- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
@@ -222,7 +222,7 @@ namespace CIAO
 
         throw;
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Connection_Handler::connect_instance - "
@@ -357,7 +357,7 @@ namespace CIAO
         throw ::Deployment::InvalidConnection (conn.name.in (),
                                                ex._info ().c_str ());
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Connection_Handler::disconnect_instance - "
diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
index 3d0a7e37cb9..320346a96e7 100644
--- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp
@@ -369,7 +369,7 @@ namespace CIAO
       {
         container->uninstall_home (ref);
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Home_Handler_i::remove_instance - "
diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
index 8ace206582d..8527a7a4575 100644
--- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
@@ -234,7 +234,7 @@ namespace CIAO
       {
         cont->activate_component (comp.in ());
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Homed_Component_Handler_i::activate_instance - "
@@ -281,7 +281,7 @@ namespace CIAO
       {
         cont->passivate_component (comp.in ());
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Homed_Component_Handler_i::passivate_instance - "
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
index 4c4e60d0bce..68e6ee14079 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
@@ -222,7 +222,7 @@ namespace CIAO
                                 "Unable to resolve external reference for connection %C\n",
                                 plan.connection[connRef].name.in ()));
               }
-            catch (CORBA::Exception &ex)
+            catch (const CORBA::Exception &ex)
               {
                 CIAO_ERROR (1, (LM_ERROR, CLINFO
                                 "CIAO_ReferenceLookup_i::pre_connect - "
diff --git a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
index 44d56bf2115..dfb064af3fe 100644
--- a/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Name_Utilities.cpp
@@ -149,7 +149,7 @@ namespace CIAO
         {
           ctx->unbind (nm);
         }
-      catch (CORBA::Exception &e)
+      catch (const CORBA::Exception &e)
         {
           CIAO_ERROR (1, (LM_ERROR, CLINFO
                           "Name_Utilities::unbind_object - "
diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index fee5d4c2bd9..5f96222dd38 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -217,7 +217,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       return 0;
     }
-  catch (CORBA::Exception &exception)
+  catch (const CORBA::Exception &exception)
     {
       ACE_ERROR ((LM_ERROR,
                   "Unexpected exception caught by client: %s (%s)\n",
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index a19c1844318..8c33b41994b 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -363,7 +363,7 @@ Worker::setup (void)
 
           break;
         }
-      catch (CORBA::TRANSIENT &)
+      catch (const CORBA::TRANSIENT &)
         {
           ++j;
 
@@ -409,7 +409,7 @@ Worker::setup (void)
 
           break;
         }
-      catch (CORBA::TRANSIENT &)
+      catch (const CORBA::TRANSIENT &)
         {
           ACE_OS::sleep (1);
 
diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
index a5b2d79214d..01843b9ccdb 100644
--- a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp
@@ -76,7 +76,7 @@ namespace CIAO_Simple_Progressive_Impl
       {
         trig->hello ("Test successful; hello from SimpleUser.");
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ACE_ERROR ((LM_ERROR, "SimpleUser_exec_i::ccm_activate () - "
                      "Caught CORBA exception, details follow:\n"));
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
index 9276385caec..614a6c1f784 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser_exec.cpp
@@ -67,7 +67,7 @@ namespace CIAO_Simple_SimpleLocalUser_Impl
       {
         trig->hello ("Test successful; hello from SimpleLocalUser.");
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ACE_ERROR ((LM_ERROR, "SimpleLocalUser_exec_i::ccm_activate () - "
                      "Caught CORBA exception, details follow:\n"));
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
index d42779fa523..9b187f68a58 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
+++ b/CIAO/tests/DAnCE/Components/SimpleUser_exec.cpp
@@ -67,7 +67,7 @@ namespace CIAO_Simple_SimpleUser_Impl
       {
         trig->hello ("Test successful; hello from SimpleUser.");
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ACE_ERROR ((LM_ERROR, "SimpleUser_exec_i::ccm_activate () - "
                      "Caught CORBA exception, details follow:\n"));
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
index 3424b3c4f0d..36aa0f200cf 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp
@@ -85,7 +85,7 @@ namespace CIAO_locality_Shutdown_Impl
       {
         lm->shutdown ();
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ACE_ERROR ((LM_ERROR, "Caught CORBA Exception %C\n",
                     ex._info ().c_str ()));
diff --git a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
index 7d9f8ddaeec..a5045184e8f 100644
--- a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
+++ b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp
@@ -90,7 +90,7 @@ namespace DAnCE
                              (LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::finishLaunch - ")
                               ACE_TEXT("finishLaunch has been called on a node application\n")));
               }
-            catch (CORBA::Exception& ex)
+            catch (const CORBA::Exception& ex)
               {
                 DANCE_ERROR (DANCE_LOG_ERROR,
                              (LM_ERROR, DLINFO
@@ -128,7 +128,7 @@ namespace DAnCE
               }
           }
       }
-    catch (CORBA::Exception& ex)
+    catch (const CORBA::Exception& ex)
       {
         CORBA::Exception* local_ex = ex._tao_duplicate ();
         ::Deployment::AMH_ApplicationExceptionHolder amh_exholder (local_ex);
@@ -208,7 +208,7 @@ namespace DAnCE
                              (LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::start - ")
                               ACE_TEXT("start has been called on an application\n")));
               }
-            catch (CORBA::Exception& ex)
+            catch (const CORBA::Exception& ex)
               {
                 DANCE_ERROR (DANCE_LOG_ERROR,
                              (LM_ERROR, DLINFO
@@ -246,7 +246,7 @@ namespace DAnCE
               }
           }
       }
-    catch (CORBA::Exception& ex)
+    catch (const CORBA::Exception& ex)
       {
         CORBA::Exception* local_ex = ex._tao_duplicate ();
         ::Deployment::AMH_ApplicationExceptionHolder amh_exholder (local_ex);
@@ -331,7 +331,7 @@ namespace DAnCE
                          (LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ")
                           ACE_TEXT("startLaunch has been called on an application\n")));
           }
-        catch (CORBA::Exception& ex)
+        catch (const CORBA::Exception& ex)
           {
             DANCE_ERROR (DANCE_LOG_ERROR,
                          (LM_ERROR, DLINFO
@@ -434,7 +434,7 @@ namespace DAnCE
                            (LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::destroyApplication - ")
                             ACE_TEXT("destroyApplication has been called on node application manager\n")));
             }
-          catch (CORBA::Exception& ex)
+          catch (const CORBA::Exception& ex)
             {
               DANCE_ERROR (DANCE_LOG_ERROR,
                            (LM_ERROR, DLINFO
@@ -636,7 +636,7 @@ namespace DAnCE
                         this->node_id_.c_str ()));
           err << "StartError : " << ex.name.in () << "." << ex.reason.in ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR,
                        (LM_ERROR, DLINFO
@@ -718,7 +718,7 @@ namespace DAnCE
                         this->node_id_.c_str ()));
           err << "StopError : " << ex.name.in () << "." << ex.reason.in ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR,
                        (LM_ERROR, DLINFO
@@ -864,7 +864,7 @@ namespace DAnCE
                         this->node_id_.c_str ()));
           err << "InvalidConnection : " << ex.name.in () << "." << ex.reason.in ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR,
                        (LM_ERROR, DLINFO
@@ -940,7 +940,7 @@ namespace DAnCE
                         this->node_id_.c_str ()));
           err << "StartError : " << ex.name.in () << "." << ex.reason.in ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR,
                        (LM_ERROR, DLINFO
diff --git a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 3bf8543d502..eb20507cf02 100644
--- a/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/DAnCE/dance/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -97,7 +97,7 @@ DomainApplicationManager_Impl::startLaunch (
                     ACE_TEXT("DomainApplicationManager_Impl::startLaunch - ")
                     ACE_TEXT("DomainApplication startLaunch has been called\n")));
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       ::Deployment::AMH_ApplicationManagerExceptionHolder amh_exholder (local_ex);
@@ -215,7 +215,7 @@ DomainApplicationManager_Impl::destroyApplication (
             }
         }
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -279,7 +279,7 @@ DomainApplicationManager_Impl::getApplications (
       _tao_rh->getApplications (running_app);
       return;
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       ::Deployment::AMH_DomainApplicationManagerExceptionHolder amh_exholder (local_ex);
@@ -316,7 +316,7 @@ DomainApplicationManager_Impl::getPlan (
       _tao_rh->getPlan (plan);
       return;
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       ::Deployment::AMH_DomainApplicationManagerExceptionHolder amh_exholder (local_ex);
@@ -453,7 +453,7 @@ DomainApplicationManager_Impl::preparePlan(DAM_CompletionHandler* completion_han
               _counter_ptr->decrement_exec_count ();
               // continue for next node
             }
-          catch (CORBA::Exception &ex)
+          catch (const CORBA::Exception &ex)
             {
               DANCE_ERROR (DANCE_LOG_ERROR,
                            (LM_ERROR, DLINFO
@@ -497,7 +497,7 @@ DomainApplicationManager_Impl::preparePlan(DAM_CompletionHandler* completion_han
                     ACE_TEXT("Propagating StartError exception caught here\n")));
       throw e;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -567,7 +567,7 @@ DomainApplicationManager_Impl::destroyManager (DAM_CompletionHandler* completion
                                 p));
                   p->destroyApplication (da_ch_ptr);
                 }
-              catch (CORBA::Exception &ex)
+              catch (const CORBA::Exception &ex)
                 {
                   DANCE_ERROR (DANCE_LOG_ERROR,
                                (LM_ERROR, DLINFO
@@ -614,7 +614,7 @@ DomainApplicationManager_Impl::destroyManager (DAM_CompletionHandler* completion
                     ACE_TEXT("Propagating StopError exception caught here\n")));
       throw e;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -693,7 +693,7 @@ DomainApplicationManager_Impl::finishDestroyManager (const DAM_CompletionHandler
               (*iter).int_id_->sendc_destroyManager (dam_nm_handler.in (),
                                                     (*iter).ext_id_.in());
             }
-            catch (CORBA::Exception &ex)
+            catch (const CORBA::Exception &ex)
               {
                 DANCE_ERROR (DANCE_LOG_ERROR,
                              (LM_ERROR, DLINFO
@@ -742,7 +742,7 @@ DomainApplicationManager_Impl::finishDestroyManager (const DAM_CompletionHandler
       CORBA::Exception* local_ex = e._tao_duplicate ();
       ch_ptr->handle_exception (local_ex);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -914,7 +914,7 @@ void DAM_NM_ReplyHandlerImpl::preparePlan_excep (
                     this->node_id_.c_str()));
       err << "StartError : " << ex.name.in () << "." << ex.reason.in ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -986,7 +986,7 @@ void DAM_NM_ReplyHandlerImpl::destroyManager_excep (
                     ACE_TEXT("StopError exception caught.\n")));
       err << "StopError : " << ex.name.in () << "." << ex.reason.in ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_ERROR,
                    (LM_ERROR, DLINFO
@@ -1053,7 +1053,7 @@ DomainApplicationManager_Impl::StartLaunchCompletionHandler::handle_completion (
           da_servant,
           connections);
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       this->dam_servant_->fail_startLaunch (this->dam_rh_.in (),
diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp b/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
index 492dfc01f00..bbd7b5806fb 100644
--- a/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/DAnCE/dance/ExecutionManager/ExecutionManager_Impl.cpp
@@ -96,7 +96,7 @@ ExecutionManager_Impl::preparePlan (::Deployment::AMH_ExecutionManagerResponseHa
                   ACE_TEXT("ExecutionManager_Impl::preparePlan - ")
                   ACE_TEXT("Domain Application Manager preparePlan has been called.\n")));
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
                    (LM_ERROR, DLINFO
@@ -184,7 +184,7 @@ ExecutionManager_Impl::getManagers (::Deployment::AMH_ExecutionManagerResponseHa
       _tao_rh->getManagers (managers);
       return;
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       ::Deployment::AMH_ExecutionManagerExceptionHolder amh_exholder (local_ex);
@@ -254,7 +254,7 @@ ExecutionManager_Impl::destroyManager (::Deployment::AMH_ExecutionManagerRespons
     ::Deployment::AMH_ExecutionManagerExceptionHolder amh_exholder (local_ex);
     _tao_rh->destroyManager_excep (&amh_exholder);
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       CORBA::Exception* local_ex = ex._tao_duplicate ();
       ::Deployment::AMH_ExecutionManagerExceptionHolder amh_exholder (local_ex);
diff --git a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
index 5b60883116c..d5da3e34d29 100644
--- a/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
+++ b/DAnCE/dance/ExecutionManager/ExecutionManager_Module.cpp
@@ -270,7 +270,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
                 }
             }
         }
-      catch (CORBA::Exception&)
+      catch (const CORBA::Exception&)
         {
           DANCE_DEBUG (DANCE_LOG_NONFATAL_ERROR,
                        (LM_DEBUG,
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
index 21048c3bb1b..dd7c9f0c762 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp
@@ -69,7 +69,7 @@ namespace DAnCE
                 {
                   this->invoke (handler.in ());
                 }
-              catch (CORBA::UserException &ex)
+              catch (const CORBA::UserException &ex)
                 {
                   DANCE_ERROR (DANCE_LOG_EVENT_TRACE,
                                (LM_INFO, DLINFO
@@ -79,7 +79,7 @@ namespace DAnCE
                                 this->name_.c_str ()));
                   this->instance_excep_ = DAnCE::Utility::create_any_from_user_exception (ex);
                 }
-              catch (CORBA::SystemException &ex)
+              catch (const CORBA::SystemException &ex)
                 {
                   DANCE_ERROR (DANCE_LOG_EVENT_TRACE,
                                (LM_INFO, DLINFO
@@ -138,7 +138,7 @@ namespace DAnCE
                       this->name_.c_str ()));
         this->holder_.set (result);
       }
-    catch (CORBA::UserException &ex)
+    catch (const CORBA::UserException &ex)
       {
         DANCE_ERROR (DANCE_LOG_MAJOR_EVENT,
                      (LM_INFO, DLINFO
@@ -158,7 +158,7 @@ namespace DAnCE
         this->holder_.set (result);
         return -1;
       }
-    catch (CORBA::SystemException &ex)
+    catch (const CORBA::SystemException &ex)
       {
         DANCE_ERROR (DANCE_LOG_MAJOR_EVENT,
                      (LM_INFO, DLINFO
diff --git a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
index 0fc78083e1e..cbc2c3996d9 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
+++ b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
@@ -220,7 +220,7 @@ NodeApplication_Impl::prepare_instance (const char *name,
                     ACE_TEXT ("Locality <%C> successfully prepared.\n"),
                     name));
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO
                        ACE_TEXT ("NodeApplication_Impl::prepare_instance - ")
@@ -448,7 +448,7 @@ NodeApplication_Impl::remove_instances (void)
                                            ex.reason.in ());
 
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO
                            ACE_TEXT ("NodeApplication_Impl::remove_instances - ")
@@ -520,7 +520,7 @@ NodeApplication_Impl::remove_instances (void)
                                            ex.reason.in ());
 
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
                        (LM_ERROR, DLINFO
diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
index d4ab078fb63..13a062b66ff 100644
--- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
+++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp
@@ -714,7 +714,7 @@ resolve_manager (ACE_Time_Value timeout, const ACE_TCHAR * ior, CORBA::ORB_ptr o
           else
             break;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_WARNING,
                        (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ")
@@ -747,7 +747,7 @@ resolve_manager (ACE_Time_Value timeout, const ACE_TCHAR * ior, CORBA::ORB_ptr o
           break;
         ACE_OS::sleep (retry);
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         DANCE_ERROR (DANCE_LOG_WARNING,
                      (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ")
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
index c75d6f3a144..99f2732c7a4 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
@@ -49,7 +49,7 @@ namespace DAnCE
                         name, ex.source.in (), ex.reason.in ()));
           return false;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Unexpected CORBA Exception while installing package with name: %s.  Reason: %C\n"),
@@ -106,7 +106,7 @@ namespace DAnCE
                         uuid));
           return false;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("Unexpected CORBA Exception while uninstalling package with uuid: %s. Reason: %C\n"),
@@ -136,7 +136,7 @@ namespace DAnCE
           CORBA::StringSeq_var packages = this->rm_->getAllNames ();
           return packages._retn ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_packages - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing packages: %C\n"),
@@ -164,7 +164,7 @@ namespace DAnCE
           CORBA::StringSeq_var packages = this->rm_->getAllTypes ();
           return packages._retn ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_types - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing package types: %C\n"),
@@ -199,7 +199,7 @@ namespace DAnCE
           ::CORBA::StringSeq_var types = this->rm_->findNamesByType (ACE_TEXT_ALWAYS_CHAR (type));
           types._retn ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing packages of type %C: %C\n"),
diff --git a/DAnCE/dance/TargetManager/DomainDataManager.cpp b/DAnCE/dance/TargetManager/DomainDataManager.cpp
index 04cf471fe42..81cd118251f 100644
--- a/DAnCE/dance/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/dance/TargetManager/DomainDataManager.cpp
@@ -156,7 +156,7 @@ int DAnCE::DomainDataManager::call_all_node_managers ()
             deployment_config_.get_node_manager
             (initial_domain_.node[i].name.in ());
         }
-      catch (CORBA::Exception&)
+      catch (const CORBA::Exception&)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
                       "Error trying to contact NodeManager %s\n",
@@ -184,7 +184,7 @@ int DAnCE::DomainDataManager::call_all_node_managers ()
                                         target_mgr_.in (),
                                         log);
             }
-          catch (CORBA::Exception& ex)
+          catch (const CORBA::Exception& ex)
             {
               DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR , "TM::Error in calling Join Domain==\n"));
               ex._tao_print_exception (
diff --git a/DAnCE/dance/TargetManager/Target_Manager_Module.cpp b/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
index 3327fcb6f43..2c8593b51b1 100644
--- a/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
+++ b/DAnCE/dance/TargetManager/Target_Manager_Module.cpp
@@ -197,7 +197,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
                     }
                 }
             }
-          catch (CORBA::Exception&)
+          catch (const CORBA::Exception&)
             {
               DANCE_DEBUG (DANCE_LOG_ERROR,
                            (LM_WARNING, DLINFO ACE_TEXT ("DAnCE_TargetManager_Module::init - ")
diff --git a/DAnCE/tests/TargetManager/CmpClient.cpp b/DAnCE/tests/TargetManager/CmpClient.cpp
index 7a574eb3cd5..e2d86b0292d 100644
--- a/DAnCE/tests/TargetManager/CmpClient.cpp
+++ b/DAnCE/tests/TargetManager/CmpClient.cpp
@@ -259,7 +259,7 @@ namespace TM_Tester
       // Finally destroy the ORB
       orb->destroy ();
     }
-    catch (CORBA::Exception &)
+    catch (const CORBA::Exception &)
     {
       DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
     }
diff --git a/DAnCE/tools/Config_Handlers/Any_Handler.cpp b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
index 2ffc3d43a06..1b6ad2d6ca8 100644
--- a/DAnCE/tools/Config_Handlers/Any_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Any_Handler.cpp
@@ -40,7 +40,7 @@ namespace DAnCE
 
           dyn->destroy ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO
                            ACE_TEXT ("Any_Handler::extract_into_any -")
diff --git a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
index 75524254e00..2fd41f856ea 100644
--- a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp
@@ -78,7 +78,7 @@ namespace DAnCE
           if (this->idl_dp_.get ())
             return true;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
             (LM_ERROR, DLINFO ACE_TEXT ("XML_File_Intf::caught - ")
@@ -152,7 +152,7 @@ namespace DAnCE
           if (this->idl_domain_.get ())
             return true;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
             (LM_ERROR, DLINFO ACE_TEXT ("XML_File_Intf::caught - ")
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
index cb2ab454255..29c625e777b 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
@@ -162,7 +162,7 @@ DAnCE_Domain_Validator_i::validate_node (const char * node_name)
           return false;
         }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
                    (LM_DEBUG, DLINFO
@@ -255,7 +255,7 @@ DAnCE_Domain_Validator_i::block_for_node (const char * node_name,
           if (!CORBA::is_nil (obj))
             break;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_WARNING,
                        (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ")
@@ -283,7 +283,7 @@ DAnCE_Domain_Validator_i::block_for_node (const char * node_name,
         if (!non_existant)
           break;
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         DANCE_ERROR (DANCE_LOG_WARNING,
                      (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ")
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
index c121dc89897..6570ece265a 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp
@@ -93,7 +93,7 @@ namespace DAnCE
                                            ACE_TEXT ("SHS_CORBA_Transport::configure - ")
                                            ACE_TEXT ("Unable to resolve SHS Daemon\n")));
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_NOTICE, DLINFO
                                          ACE_TEXT ("SHS_CORBA_Transport::configure - ")
@@ -129,7 +129,7 @@ namespace DAnCE
                           ACE_TEXT (" nil daemon ref\n")));
 
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO
                                          ACE_TEXT ("SHS_CORBA_Transport::push_event - ")
diff --git a/TAO/docs/tutorials/Quoter/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp
index cf27865dc1a..e82a07f7b45 100644
--- a/TAO/docs/tutorials/Quoter/AMI/client.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp
@@ -77,7 +77,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp
index 0f04cc5119d..3e9d85ba4cb 100644
--- a/TAO/docs/tutorials/Quoter/AMI/server.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp
@@ -38,7 +38,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index c1d577d0cbf..1ef4a0973da 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -46,7 +46,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
index fb8a6175ff9..1e7241f0a12 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
@@ -96,7 +96,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index 7d6f53e5d18..2f81d84abe7 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     // Finally destroy the ORB
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
index 114f6d14c88..3ea2f315b90 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
@@ -47,7 +47,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
index cf27865dc1a..e82a07f7b45 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
@@ -77,7 +77,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
index 144744986b8..5314c2284ef 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
@@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
index 392eddde61a..1e1cf9130f5 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
@@ -148,7 +148,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Cleanup the ORB.
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
index ee2cb97d618..3aa440348be 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
@@ -203,7 +203,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (1, 1);
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
index 891fc309ac4..cf82cf24385 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
@@ -169,7 +169,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (1, 1);
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Admin: ");
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index 96ea1189624..f2ee0a466cc 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -119,7 +119,7 @@ StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
 
       return quoter_var._retn ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("StockDistributor_i::provide_quoter_info");
       return ::Stock::StockQuoter::_nil ();
@@ -208,7 +208,7 @@ struct Stock_Publisher
         // publish!
         item.second.first->push_StockName (this->sn_.in ());
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ex._tao_print_exception ("Distributor: Stock_Publisher");
       }
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index b3086fe8d36..641e33c54ec 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -50,7 +50,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
             {
               e._tao_print_exception ("Stock exception: invalid stock name: ");
             }
-          catch (CORBA::Exception &ex)
+          catch (const CORBA::Exception &ex)
             {
       ex._tao_print_exception ("Stock_StockNameConsumer_i::push_StockName: ");
             }
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
index 64525c7cdf9..c0752c44f1a 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
@@ -248,8 +248,8 @@ While the state of the StockDistributor object is active, continue the following
 <li>Publish the stock information to all the StockNameConsumer objects that have subscribed.</li>
 <PRE>
     for (Stock_StockDistributor_i::CookieMap::iterator iter = this->subscribers_list_.begin ();
-	       iter != this->subscribers_list_.end ();
-	       ++iter)
+         iter != this->subscribers_list_.end ();
+         ++iter)
       {
         try
           {
@@ -265,7 +265,7 @@ While the state of the StockDistributor object is active, continue the following
             // in the service_context list of the GIOP message.
             STOCK_DATABASE->publish_stock_info (iter->second.first);
           }
-        catch (CORBA::Exception &ex)
+        catch (const CORBA::Exception &ex)
           {
             ACE_PRINT_EXCEPTION (ex, "Stock_StockDistributor_i::svc: ");
           }
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index e6bf7683f00..bcd69672390 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &ex) {
+  catch (const CORBA::Exception &ex) {
     cerr << "CORBA exception raised!" << ex << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
index 01129f67292..17dccb26536 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
@@ -96,7 +96,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
index 23c8f86ae1f..80020421014 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     // Finally destroy the ORB
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/index.html b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
index 33a8cca7092..7ec67d00260 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
@@ -165,7 +165,7 @@ int main (int argc, char* argv[])
     </P>
 <PRE>
   }
-  catch (CORBA::Exception &ex) {
+  catch (const CORBA::Exception &ex) {
     std::cerr << "CORBA exception raised!" << std::endl;
   }
   return 0;
@@ -189,7 +189,7 @@ int main (int argc, char* argv[])
 
     orb->destroy ();
   }
-  catch (CORBA::Exception &ex) {
+  catch (const CORBA::Exception &ex) {
     std::cerr << "CORBA exception raised!" << std::endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
index 23c8f86ae1f..80020421014 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     // Finally destroy the ORB
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
index eb0b39105a3..e4337ae6b7c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
@@ -100,7 +100,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     root_poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised !" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
index c7b58b5420d..9e452b34601 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
@@ -77,7 +77,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl
          << endl;
   }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
index 23c8f86ae1f..80020421014 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     // Finally destroy the ORB
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
index c42f81726a5..87a1c3dc7e3 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
@@ -92,7 +92,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     root_poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised !" << endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/index.html b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
index ba48b718f6a..aeb82f41581 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
@@ -40,13 +40,13 @@ private:
 };
 </PRE>
     <P>In a server, CORBA objects and functions are implemented and
-      represented by programming language data and functions. These 
-      programming entities that implement and represent CORBA objects 
-      are called <I>servants</I>. <I>Object Adapters</I> link the world of 
-      CORBA objects to the world of programming language servants. They 
-      provide services for creation of CORBA objects and their object 
+      represented by programming language data and functions. These
+      programming entities that implement and represent CORBA objects
+      are called <I>servants</I>. <I>Object Adapters</I> link the world of
+      CORBA objects to the world of programming language servants. They
+      provide services for creation of CORBA objects and their object
       references and for dispatching requests to the appropriate
-      servants. 
+      servants.
     </P>
     <P>Notice the name of the base class.  TAO implements the CORBA 2.2
       specification, which includes the Portable Object Adapter (hence
@@ -63,7 +63,7 @@ private:
       file names can be controlled through IDL compiler options in
       most cases.
     </P>
-    <P>A server application may contain multiple POA instances, but all 
+    <P>A server application may contain multiple POA instances, but all
       server applications have at least one POA called the <I>RootPOA</I>.
     <P>We have to implement the operations and attributes:
     </P>
@@ -175,8 +175,8 @@ Quoter_Stock_Factory_i::get_stock (const char *symbol)
       the client-side stubs and server-side skeletons are not related
       through inheritance.  You must either explicitly activate the
       servant (your implementation object) or use <CODE>_this()</CODE> to
-      activate it with its default POA.  <CODE>_this()</CODE> creates and 
-      registers a CORBA object under the RootPOA, and returns the created 
+      activate it with its default POA.  <CODE>_this()</CODE> creates and
+      registers a CORBA object under the RootPOA, and returns the created
       object reference for the new object. We will discuss more about
       explicit and implicit activation later, but at this point it is
       important to remove any thoughts about converting pointers to
@@ -262,7 +262,7 @@ int main (int argc, char* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &ex) {
+  catch (const CORBA::Exception &ex) {
     std::cerr << "CORBA exception raised!" << std::endl;
   }
   return 0;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
index 3474e53c151..7553ee5702b 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
@@ -37,7 +37,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception &) {
+  catch (const CORBA::Exception &) {
     cerr << "CORBA exception raised!" << endl;
   }
   return 0;
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index 581ba38a9aa..cc51ac124a2 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -34,7 +34,7 @@ WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     {
       Application->ShowException (&exception);
     }
-  catch (CORBA::Exception &exception)
+  catch (const CORBA::Exception &exception)
     {
       ShowMessage (String ("CORBA exception: ") + exception._rep_id ());
     }
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index 2aa01167766..ca04e226874 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -56,7 +56,7 @@ __fastcall TChatClientWindow::TChatClientWindow (TComponent* Owner)
       // Register ourselves with the server.
       server_->add (receiver_var_, nickname_.c_str ());
     }
-  catch (CORBA::Exception &e)
+  catch (const CORBA::Exception &e)
     {
       ShowMessage ("CORBA Exception in TChatClientWindow constructor: "
                    + String (e._rep_id ()));
diff --git a/TAO/examples/Borland/ORBThread.cpp b/TAO/examples/Borland/ORBThread.cpp
index 278b384362a..dfa11b3d185 100644
--- a/TAO/examples/Borland/ORBThread.cpp
+++ b/TAO/examples/Borland/ORBThread.cpp
@@ -31,7 +31,7 @@ __fastcall TORBThread::~TORBThread ()
     {
       orb_->shutdown (0);
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
 
@@ -44,7 +44,7 @@ void __fastcall TORBThread::Execute ()
     {
       orb_->run ();
     }
-  catch (CORBA::Exception& e)
+  catch (const CORBA::Exception& e)
     {
       ShowMessage (e._rep_id ());
       Application->Terminate ();
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index d70147e227a..2925740e769 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -85,7 +85,7 @@ MIF_DT_Creator::wait (void)
         {
           (void)this->orb_->work_pending ();
         }
-      catch (CORBA::BAD_INV_ORDER const &)
+      catch (const CORBA::BAD_INV_ORDER const &)
         {
           // If there is BAD_INV_ORDER exception there is
           // no point in running this loop any more.
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 572a73246c8..52e313254e0 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -128,7 +128,7 @@ BE_ifr_repo_init (void)
 
     be_global->repository (repo._retn ());
   }
-  catch (CORBA::ORB::InvalidName &)
+  catch (const CORBA::ORB::InvalidName &)
   {
     ORBSVCS_ERROR ((LM_ERROR,
                 ACE_TEXT ("resolution of Interface Repository failed\n")));
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 88d0ef49539..2e5a38437ef 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -352,7 +352,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void)
 
       this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ());
     }
-  catch (CORBA::Exception &)
+  catch (const CORBA::Exception &)
     {
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to resolve the Naming Service.\n"),
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 58a8edd9279..873f7247f16 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -207,7 +207,7 @@ int TestClient::svc()
                 ::CORBA::Long instance = test->send_message(threadNum, i, objIter, requestIter);
                 ACE_UNUSED_ARG (instance);
               }
-              catch (CORBA::SystemException& ex)
+              catch (const CORBA::SystemException& ex)
               {
                 // If these exceptions are expected record the number of instances, otherwise rethrow
                 if (expectHolding_ == true && ex.minor() == TAO_POA_HOLDING)
@@ -254,7 +254,7 @@ int TestClient::svc()
 
     return 0;
   } // try
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
                threadNum, i, objIter, requestIter, currentIOR.c_str()));
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
index e3dc93eeafd..2990cc0b6f0 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
@@ -17,7 +17,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     cerr << "TestClient: " << ex << endl;
   }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
index 42d63b18471..11f615ec393 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
@@ -56,7 +56,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     cerr << "Manager: " << ex << endl;
   }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
index f6445a574ea..c6118e25d69 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
@@ -15,7 +15,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     cerr << "CORBA error: " << ex << endl;
   }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 075f2a9d0ba..889e23c95c2 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -72,7 +72,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     poa->destroy(1, 1);
     orb->destroy();
 
-  } catch (CORBA::Exception& e) {
+  } catch (const CORBA::Exception& e) {
     e._tao_print_exception ("Combined Service:");
   }
   return 0;
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index d7980f786ca..9bf463931ca 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -63,7 +63,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
     ACE_DEBUG((LM_DEBUG, "Controller: done.\n"));
 
     return 0;
-  } catch (CORBA::Exception& e) {
+  } catch (const CORBA::Exception& e) {
     e._tao_print_exception ("Controller:");
   }
   return 1;
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 6b99cec2b0f..71186f3df88 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -39,7 +39,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       return 0;
     }
-  catch (CORBA::Exception& e)
+  catch (const CORBA::Exception& e)
     {
       e._tao_print_exception ("test:");
     }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index b7b870f445e..8b37a4c981c 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -85,7 +85,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
     root_poa->destroy(1, 1);
     orb->destroy();
 
-  } catch (CORBA::Exception& e) {
+  } catch (const CORBA::Exception& e) {
     e._tao_print_exception ("TestServer::init()");
   }
   return 0;
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index 2f1c2b82780..e11e6e64d31 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -132,7 +132,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request)
       // At this point the NVList contains all the out and inout
       // arguments, but we need to extract the return value...
     }
-  catch (CORBA::UnknownUserException& user_ex)
+  catch (const CORBA::UnknownUserException& user_ex)
     {
       // Pass the exception back to the server request...
       request->set_exception (user_ex.exception ());
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 3c26d56fa2e..08646ea614c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -116,7 +116,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
     {
       control->supplier_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       control->system_exception (this, sysex);
     }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index 7fe469ce6e6..f0cd4b2ed20 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -625,7 +625,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event)
     {
       control->consumer_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       control->system_exception (this,
                                  sysex);
@@ -669,7 +669,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
         }
      control->consumer_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -738,7 +738,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
         }
       control->consumer_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
@@ -813,7 +813,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
         }
       control->consumer_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 99505ae065d..e681bf7a028 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -522,7 +522,7 @@ TAO_EC_Gateway_IIOP::push_to_consumer (
     {
       ec_control_->event_channel_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       ec_control_->system_exception (this,
                                      sysex);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index c2c252d2545..921fff9fd86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -352,7 +352,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
           control->consumer_not_exist (this);
         }
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       // Do not report errors for old consumers
       // NOTE: The comparison below is not completely correct, it
@@ -392,7 +392,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
 
       control->consumer_not_exist (this);
     }
-  catch (CORBA::SystemException& sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 8e00a1329e0..4e677c31071 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -95,7 +95,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification
       }
     peer->notify_updated_object_group (object_group_info);
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 3)
         ex._tao_print_exception (
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index 989bf39c3d5..a46e23c244b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -86,7 +86,7 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
     // object reference itself
     // No action required
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
      ex._tao_print_exception (
         ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ")
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index 01b0605fadc..2428bfe6544 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -88,7 +88,7 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
     // object reference itself
     // No action required
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (
        ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve - ")
@@ -123,7 +123,7 @@ TAO_FT_Storable_Naming_Context::propagate_update_notification (
     // Notify the naming_manager of the updated context
     peer->notify_updated_context (context_info);
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 3)
         ex._tao_print_exception (ACE_TEXT ("Unable to communicate with peer.\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 588c0c70bb9..821b53650bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -808,11 +808,11 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer)
       else
         status = true;
     }
-  catch (CORBA::TIMEOUT&)
+  catch (const CORBA::TIMEOUT&)
     {
        status = true;
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       if (DEBUG_LEVEL > 0)
       {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index be54204c663..a6d28b1e257 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -51,7 +51,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_ptr filter_poa)
         {
           object = filter_poa->servant_to_reference (this);
         }
-      catch (CORBA::Exception& )
+      catch (const CORBA::Exception& )
         {
          return CosNotifyFilter::FilterFactory::_nil();
         }
@@ -72,7 +72,7 @@ TAO_Notify_ETCL_FilterFactory::destroy (void)
         this->filter_poa_->servant_to_id (this);
       this->filter_poa_->deactivate_object (id.in());
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
 
@@ -128,7 +128,7 @@ TAO_Notify_ETCL_FilterFactory::create_filter (
         {
           oid = this->filter_poa_->servant_to_id (filter);
         }
-      catch (CORBA::Exception& )
+      catch (const CORBA::Exception& )
         {
           throw CORBA::INTERNAL ();
           return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index f2e9ec6c8ad..cc65384f911 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -114,11 +114,11 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier)
       else
         status = true;
     }
-  catch (CORBA::TIMEOUT&)
+  catch (const CORBA::TIMEOUT&)
     {
        status = true;
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       if (DEBUG_LEVEL > 0)
       {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 39546575e42..269b0b839e6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1039,14 +1039,14 @@ TAO_PG_ObjectGroupManager::ping (CORBA::ORB_ptr orb,
   try {
     status = ! rtt_obj->_non_existent ();
   }
-  catch (CORBA::TIMEOUT& ex)
+  catch (const CORBA::TIMEOUT& ex)
   {
     if (TAO_debug_level > 8)
     {
       ex._tao_print_exception ("TAO_PG_ObjectGroupManager::ping");
     }
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     if (TAO_debug_level > 8)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index abbfd795475..3eabba2654e 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -171,7 +171,7 @@ int TestTask::svc()
 
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception ("CORBA exception: ");
   }
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 128d429cd5a..5671046c545 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -134,7 +134,7 @@ int TestTask::svc()
 
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception ("CORBA exception: ");
   }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index 76d5260263b..b05a8f66f3c 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -77,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
           result = 1;
         }
-      catch (CORBA::TRANSIENT my_ex)
+      catch (const CORBA::TRANSIENT my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n"));
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index d29d8ce1854..0ce579a79e2 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           orb2 =
             CORBA::ORB_init (three, argv2, "orb2" );
         }
-      catch (CORBA::BAD_PARAM bad_param)
+      catch (const CORBA::BAD_PARAM bad_param)
         {
           ACE_UNUSED_ARG (bad_param);
           ACE_DEBUG ((LM_ERROR, "Error - REGRESSION - ORB doesn't even accept the config option\n"));
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index abbfd795475..3eabba2654e 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -171,7 +171,7 @@ int TestTask::svc()
 
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception ("CORBA exception: ");
   }
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
index 128d429cd5a..5671046c545 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -134,7 +134,7 @@ int TestTask::svc()
 
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception ("CORBA exception: ");
   }
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
index 54384a18007..fdfcba3226d 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
@@ -68,7 +68,7 @@ int NamingTask::svc()
       ACE_ERROR ((LM_ERROR, "Error, Unable to initialize the Naming Service.\n"));
     }
   }
-  catch (CORBA::Exception& ex) {
+  catch (const CORBA::Exception& ex) {
     ex._tao_print_exception ("CORBA exception: NamingTask::svc() ");
   }
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index a49ab22c6d3..09866f67af3 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -29,7 +29,7 @@ TestEventConsumer_i::ORB_task::svc ()
       this->orb_->run ();
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestEventConsumer_i ORB_task exiting\n")));
     }
-  catch (CORBA::SystemException &e)
+  catch (const CORBA::SystemException &e)
     {
       e._tao_print_exception (
         ACE_TEXT (
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 20b3804ddb7..83b687dc51a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -177,7 +177,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       orb->destroy ();
       return 0;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception (
         ACE_TEXT (
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index 542e9c463e3..68d8ae17590 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -67,7 +67,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       orb->destroy();
       return 0;
     }
-  catch (CORBA::Exception& exc)
+  catch (const CORBA::Exception& exc)
     {
       ACE_ERROR ((LM_ERROR,
                   "Caught CORBA::Exception\n%C (%C)\n",
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 5dbc8b8aa67..6c01dd0482b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -103,7 +103,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     return 0;
 
   }
-  catch (CORBA::Exception& exc)
+  catch (const CORBA::Exception& exc)
   {
     ACE_ERROR ((LM_ERROR,
     "Caught CORBA::Exception\n%C (%C)\n",
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index ed54c02d3d9..a5d18cf66ab 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -261,7 +261,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
     return 0;
   }
-  catch (CORBA::Exception& exc)
+  catch (const CORBA::Exception& exc)
   {
     ACE_ERROR ((LM_ERROR,
     "Caught CORBA::Exception\n%C (%C)\n",
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index b845098cce3..a0c5327f7a8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -1476,7 +1476,7 @@ do_persistence_objectgroup_test (
                                    RC_ERROR);
               }
             }
-            catch (CORBA::Exception& ex)
+            catch (const CORBA::Exception& ex)
             {
               ex._tao_print_exception ("ERROR: invoking get_string on Basic object.\n");
               return RC_ERROR;
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
index 4a8dcd214e2..777ce44f7e5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
@@ -149,7 +149,7 @@ int TestTask::svc()
 
     return 0;
   }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (ACE_TEXT ("CORBA exception: "));
   }
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index db015d94150..8bf3f592813 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             Test::Basic::_narrow (tmp.in ());
 
         }
-        catch (CORBA::Exception& ex)
+        catch (const CORBA::Exception& ex)
           {
             ex._tao_print_exception (ACE_TEXT ("Error resolving name.\n"));
           }
@@ -110,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       the_string.in ()));
 
         }
-        catch (CORBA::Exception& ex)
+        catch (const CORBA::Exception& ex)
           {
             ex._tao_print_exception (
               ACE_TEXT ("Error invoking get_string on Basic object.\n"));
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               // Try removing a member
               basic->remove_member ();
             }
-            catch (CORBA::Exception& ex)
+            catch (const CORBA::Exception& ex)
               {
                 ex._tao_print_exception (
                   ACE_TEXT ("Error invoking get_string on Basic object.\n"));
@@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%P|%t) - Shutting down server\n")));
       }
-      catch (CORBA::Exception& ex)
+      catch (const CORBA::Exception& ex)
       {
         ex._tao_print_exception (
           ACE_TEXT ("Error invoking get_string on Basic object.\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
index 110a985d42c..3b7d0c625b1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
@@ -63,7 +63,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                     ACE_TEXT("Client got reply: %C\n"),
                           message.in()));
             }
-          catch (CORBA::Exception &ex)
+          catch (const CORBA::Exception &ex)
             {
               ACE_CString str = ex._info ();
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,7 +73,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       return 0;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_CString str = ex._info ();
       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client main() caught: %C\n"),
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 1d60a35a43d..8f450801ae1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->destroy ();
       return 0;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_CString str = ex._info ();
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server main() caught: %C\n"),
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
index 2856e451324..681708b8423 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
@@ -30,7 +30,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
               success = true;
             }
-          catch (CORBA::OBJECT_NOT_EXIST &)
+          catch (const CORBA::OBJECT_NOT_EXIST &)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("Test caught Object Not Exist, retry %d\n"),
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index e1568cd4dba..04f3cff45e4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -70,7 +70,7 @@ set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to)
           ret = CORBA::Object::_duplicate (obj);
         }
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (ACE_TEXT ("set_timeout_policy ()"));
       ret = CORBA::Object::_duplicate (obj);
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 7ea73ac5f3e..6a3f4d0832b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -57,7 +57,7 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts (
     {
       this->poa_->destroy (1,1);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %s\n",
                   ex._name()));
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index 81d986b2d69..92d6c0803bc 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -69,7 +69,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("(%P|%t|%T) Client %d received reply from server %d\n"),
                       client_num, n));
         }
-      catch (CORBA::TRANSIENT &)
+      catch (const CORBA::TRANSIENT &)
         {
           if (expect_transient)
             {
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 5bf2df4f6fb..2b971eefbff 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -149,7 +149,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                         ACE_TEXT ("(%P|%t|%T) Server %d received reply from server %d\n"),
                         server_num, n));
           }
-        catch (CORBA::TRANSIENT &)
+        catch (const CORBA::TRANSIENT &)
           {
             if (expect_transient)
               {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
index 1626804a4bf..ea322c3966f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
@@ -56,7 +56,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ifr = CORBA::ComponentIR::Repository::_narrow (obj.in());
         }
-      catch (CORBA::SystemException &)
+      catch (const CORBA::SystemException &)
         {
           ACE_DEBUG ((LM_DEBUG, "exception catched .. narrowing IFR object\n" ));
           return 1;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index a69e2f32b25..19dde458bd5 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -83,7 +83,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           the_repo_ref = CORBA::ComponentIR::Repository::_narrow (objref.in ());
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           ex._tao_print_exception ("Can't narrow the IFR:");
           return 1;
@@ -107,7 +107,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           value_descr = value_def->describe_ext_value ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           ex._tao_print_exception ("Can't describe_ext_value:");
           return 1;
@@ -124,7 +124,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                     current_member.name.in ()));
       }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("MAIN: Unexpected CORBA exception caught:");
       return 1;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index 4b8d8b650a3..f75482473fd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -141,7 +141,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           result= -1;
         }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("ERROR: CORBA Exception");
       result= -1;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 4f9a251dfcd..8ac58bf4e75 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -38,7 +38,7 @@ get_event_channel(CORBA::ORB_ptr orb)
   {
     channelIdSeq = factory->get_all_channels();
   }
-  catch (CORBA::SystemException& se )
+  catch (const CORBA::SystemException& se )
   {
     std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
@@ -51,7 +51,7 @@ get_event_channel(CORBA::ORB_ptr orb)
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
@@ -70,7 +70,7 @@ get_event_channel(CORBA::ORB_ptr orb)
       throw;
     }
 
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index 571c229299c..c46fe141bd4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -171,7 +171,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during connect: " <<
         se << std::endl;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 6612fc33e43..034ff5dcfcd 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -44,7 +44,7 @@ get_event_channel(CORBA::ORB_ptr orb)
   {
     channelIdSeq = factory->get_all_channels();
   }
-  catch (CORBA::SystemException& se )
+  catch (const CORBA::SystemException& se )
   {
     std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
@@ -58,7 +58,7 @@ get_event_channel(CORBA::ORB_ptr orb)
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
@@ -77,7 +77,7 @@ get_event_channel(CORBA::ORB_ptr orb)
       exit(1);
     }
 
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
@@ -102,7 +102,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter,
   {
     std::cerr << "UnsupportedFilterableData!" << std::endl;
   }
-  catch (CORBA::SystemException& se )
+  catch (const CORBA::SystemException& se )
   {
     std::cerr << "System exception occurred during match_structured: "
       << se << std::endl;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 96990ac6304..400d97dfea8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -78,7 +78,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during connect: " <<
         se << std::endl;
@@ -111,13 +111,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     try{
       ppc->push_structured_event(event);
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
         << se << std::endl;
       throw;
     }
-    catch (CORBA::Exception&)
+    catch (const CORBA::Exception&)
     {
       std::cerr << "Unknown exception occurred during push" << std::endl;
       throw;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 4f9a251dfcd..8ac58bf4e75 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -38,7 +38,7 @@ get_event_channel(CORBA::ORB_ptr orb)
   {
     channelIdSeq = factory->get_all_channels();
   }
-  catch (CORBA::SystemException& se )
+  catch (const CORBA::SystemException& se )
   {
     std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
@@ -51,7 +51,7 @@ get_event_channel(CORBA::ORB_ptr orb)
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
@@ -70,7 +70,7 @@ get_event_channel(CORBA::ORB_ptr orb)
       throw;
     }
 
-    catch (CORBA::SystemException& se )
+    catch (const CORBA::SystemException& se )
     {
       std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index 9ab2f4ee5c7..1dc331eb2fb 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -170,7 +170,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during connect: " <<
         se << std::endl;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 6c48e903007..647111c3284 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -80,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during connect: " <<
         se << std::endl;
@@ -118,13 +118,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     try{
       ppc->push_structured_event(event);
     }
-    catch (CORBA::SystemException& se)
+    catch (const CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
         << se << std::endl;
       throw;
     }
-    catch (CORBA::Exception&)
+    catch (const CORBA::Exception&)
     {
       std::cerr << "Unknown exception occurred during push" << std::endl;
       throw;
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ec9df0597f2..decb3b34b47 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -42,7 +42,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::destroy (void)
         this->filter_poa_->servant_to_id (this);
       this->filter_poa_->deactivate_object (id.in());
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
 
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index 6ac9c87c891..6b4af0e64bd 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -182,7 +182,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       "secure_invocation_test returned <%d>\n",
                       status));
         }
-      catch (CORBA::Exception const &ex)
+      catch (const CORBA::Exception const &ex)
         {
           if (set_cert_file)
             {
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index 0aeea98134d..c5eff89d754 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager_factory
         = root_poa->the_POAManagerFactory ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception("initialization error ");
       return 1;
@@ -144,7 +144,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       good_pm = poa_manager_factory->create_POAManager ("goodPOAManager",
                                                         policies);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Failed to create reachable POA manager");
       return 1;
@@ -179,7 +179,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_OS::fprintf (output_file, "%s", good_ior.in ());
       ACE_OS::fclose (output_file);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("cannot run server");
     }
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index f4376b7d0b5..4a27792bf5d 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -103,7 +103,7 @@ gen_objref (int argc, ACE_TCHAR *argv[])
                           1);
 
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception("initialization error ");
       return 1;
@@ -149,7 +149,7 @@ parse_objref (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception("initialization error ");
       return 1;
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index ccaf134b109..d994462047d 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -42,7 +42,7 @@ Foo_i::baz (void)
       // we go into this method, not whether the method itself operates
       // properly.
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "FOO (%P|%t) Caught exception, trying to obtain ClientCredentials"));
       ex._tao_print_exception ("Exception");
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
index 357e58afd7c..fecd0a02ab4 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -197,7 +197,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception
         (ACE_TEXT ("mixed_security/client: caught unexpected exception "));
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index 523c8fc8148..c35f9567dda 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -200,7 +200,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   (e.why_ == IORPublicationException::IO_FAILURE) ? "IO_FAILURE":
                   "<unknown>"));
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception
         ("mized_security/server: caught unexpected exception ");
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index 7def21a9b10..bf4db3004ca 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -221,7 +221,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       big_time_test(10, 10, 10, true);
       big_time_test(100, 1, 10, true);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("MAIN: Unexpected CORBA exception caught:");
       return 1;
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
index 67af6285b00..4de634fb002 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
@@ -51,7 +51,7 @@ TAO_Async_IOR_Table_Impl::async_find (::IORTable::Locate_ResponseHandler handler
                 ior = this->locator_->locate (object_key);
                 rh->forward_ior (ior.c_str(), false);
               }
-            catch (CORBA::Exception &ex)
+            catch (const CORBA::Exception &ex)
               {
                 rh->raise_excep (ex);
               }
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
index a4fe1dbbe2c..be6cb775131 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
@@ -42,7 +42,7 @@ Client_Task::svc (void)
 
            hello->shutdown ();
         }
-      catch (CORBA::INTERNAL)
+      catch (const CORBA::INTERNAL)
         {
           exception = true;
           ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n"));
diff --git a/TAO/tests/Bug_2345_Regression/server.cpp b/TAO/tests/Bug_2345_Regression/server.cpp
index 57c7ab10806..5dd67aa2b89 100644
--- a/TAO/tests/Bug_2345_Regression/server.cpp
+++ b/TAO/tests/Bug_2345_Regression/server.cpp
@@ -36,7 +36,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     return 0;
   }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
   {
     // ... normally print an error here
   }
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index 35e50784cd8..daa8567c012 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -81,7 +81,7 @@ struct Worker : ACE_Task_Base
             CORBA::String_var ret = srv_->test_method (str.in ());
             if (0 != ACE_OS::strcmp (str.in (), ret.in ())) return 1;
           }
-        catch (CORBA::Exception& ex)
+        catch (const CORBA::Exception& ex)
           {
             ACE_DEBUG ((LM_ERROR,
                         ACE_TEXT ("(%P|%t) Exception caught: \n%C\n"),
@@ -126,7 +126,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           wrk.thr_mgr ()->wait ();
         }
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Exception caught: \n%C\n"),
                   ex._info ().c_str ()));
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 05ddb4f4dbb..025249e75ce 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -128,7 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_OS::fprintf (output_file, "%s", "OK\n");
       ACE_OS::fclose (output_file);
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
@@ -151,7 +151,7 @@ Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
index 56792072cee..9dd3ffa587d 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
@@ -37,7 +37,7 @@ Quoter_Stock_Factory_i::get_stock (const char *symbol)
     } else if (ACE_OS::strcmp (symbol, "MSFT") == 0) {
       return Quoter::Stock::_duplicate(ref2_.in ());
     }
-  } catch (CORBA::Exception & e) {
+  } catch (const CORBA::Exception & e) {
     std::cerr << "CORBA exception raised: " << e << std::endl;
   }
   std::cerr << "Invalid_Stock_Symbol: " << symbol << std::endl ;
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index d3991cfade9..3f337d4ec88 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -54,7 +54,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Finally destroy the ORB
     orb->destroy ();
   }
-  catch (CORBA::Exception& e) {
+  catch (const CORBA::Exception& e) {
     cerr << "CORBA exception raised: " << e << endl;
   }
   return 0;
diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index 328c7fe8eb8..4a9607312bc 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -102,7 +102,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     root_poa->destroy (1, 1);
     orb->destroy ();
   }
-  catch (CORBA::Exception & e) {
+  catch (const CORBA::Exception & e) {
     cerr << "CORBA exception raised: " << e << endl;
   }
   return 0;
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index aa6efe616bd..4897496b35f 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -99,7 +99,7 @@ Worker::svc()
           ACE_OS::nanosleep (&ts);
 
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           excep = true;
           ACE_ERROR ((LM_ERROR,
@@ -122,7 +122,7 @@ Worker::svc()
     {
       this->orb_->shutdown();
     }
-  catch (CORBA::Exception &)
+  catch (const CORBA::Exception &)
     {
     }
 
@@ -284,7 +284,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       init_callback(worker);
 
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_ERROR ((LM_ERROR, "Exception caught: %s\"%s\"\n"
                   , ex._name(), ex._rep_id ()));
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index 4dbf005651f..eb79402810e 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -46,7 +46,7 @@ public:
                 target->shutdown ();
               }
           }
-        catch (CORBA::Exception &ex)
+        catch (const CORBA::Exception &ex)
           {
             ACE_DEBUG ((LM_DEBUG,
                         "(%P|%t) caught an exception - %C\n",ex._name()));
@@ -136,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) client done\n"));
 
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_DEBUG ((LM_DEBUG,"Main caught %s\n",ex._name()));
       return 1;
diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index 2be474414ce..0a8c9f27da5 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -53,7 +53,7 @@ public:
       {
         this->orb_->run();
       }
-    catch (CORBA::Exception &ex)
+    catch (const CORBA::Exception &ex)
       {
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) server orb run thread caught %s\n",ex._name()));
@@ -156,7 +156,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server main - caught %s\n",ex._name()));
       return 1;
diff --git a/TAO/tests/Bug_2809_Regression/server.cpp b/TAO/tests/Bug_2809_Regression/server.cpp
index 11ac4a4dc71..a7f56b9b742 100644
--- a/TAO/tests/Bug_2809_Regression/server.cpp
+++ b/TAO/tests/Bug_2809_Regression/server.cpp
@@ -40,7 +40,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((LM_ERROR, "Error, wrong debug level, should be 10\n"), 1);
         }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Server main()");
       return 1;
diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp
index 61e0b2755ea..a00540167de 100644
--- a/TAO/tests/Bug_3068_Regression/client.cpp
+++ b/TAO/tests/Bug_3068_Regression/client.cpp
@@ -141,7 +141,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       root_poa->destroy (1, 1);
     }
-  catch (CORBA::Exception &excep)
+  catch (const CORBA::Exception &excep)
     {
       excep._tao_print_exception ("Caught exception:");
       return 1;
diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp
index 6b7f44cde8a..7ece9eb1aef 100644
--- a/TAO/tests/Bug_3068_Regression/server.cpp
+++ b/TAO/tests/Bug_3068_Regression/server.cpp
@@ -123,7 +123,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       root_poa->destroy (1, 1);
     }
-  catch (CORBA::Exception &excep)
+  catch (const CORBA::Exception &excep)
     {
       excep._tao_print_exception ("Caught exception:");
       return 1;
diff --git a/TAO/tests/Bug_3068_Regression/test_i.cpp b/TAO/tests/Bug_3068_Regression/test_i.cpp
index 863770e0ec1..896f63ff15a 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3068_Regression/test_i.cpp
@@ -95,7 +95,7 @@ Caller::svc ()
           ACE_OS::sleep (tv);
         }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_DEBUG ((LM_DEBUG, "%t caught: %C\n", ex._name ()));
     }
@@ -104,7 +104,7 @@ Caller::svc ()
       ACE_OS::sleep (1);
       this->orb_->shutdown (0);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_DEBUG ((LM_DEBUG, "%t orb shutdown raised %C\n", ex._name ()));
     }
diff --git a/TAO/tests/Bug_3276_Regression/client.cpp b/TAO/tests/Bug_3276_Regression/client.cpp
index 0558ff6b9b8..53ff00e0127 100644
--- a/TAO/tests/Bug_3276_Regression/client.cpp
+++ b/TAO/tests/Bug_3276_Regression/client.cpp
@@ -78,7 +78,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             ACE_OS::sleep (2);
           }
         }
-      catch (CORBA::TRANSIENT& ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
           CORBA::ULong m = ex.minor () & 0x00000F80u;
           if (m == TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE &&
diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp
index 90a02ce55f8..46730754841 100644
--- a/TAO/tests/Bug_3531_Regression/client.cpp
+++ b/TAO/tests/Bug_3531_Regression/client.cpp
@@ -170,7 +170,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       orb->destroy ();
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) Exception caught: \n%s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR (ex._info ().c_str ())));
@@ -194,7 +194,7 @@ Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp
index da635e1b7f2..56909faf54b 100644
--- a/TAO/tests/Bug_3531_Regression/server.cpp
+++ b/TAO/tests/Bug_3531_Regression/server.cpp
@@ -134,7 +134,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_OS::fprintf (output_file, "%s", "OK\n");
       ACE_OS::fclose (output_file);
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
@@ -157,7 +157,7 @@ Worker::svc (void)
     {
       this->orb_->run ();
     }
-  catch (CORBA::Exception&)
+  catch (const CORBA::Exception&)
     {
     }
   return 0;
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 24604834f24..2d577b1291b 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -1096,7 +1096,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // cleanup
       orb->destroy ();
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index 87f319ebccc..ee743895467 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -86,7 +86,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     orb->destroy ();
   }
-  catch (CORBA::Exception& e)
+  catch (const CORBA::Exception& e)
   {
     e._tao_print_exception ("Exception caught:");
     return 1;
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
index 4060f55494d..1bd630bdd7c 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
@@ -64,7 +64,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_ERROR_RETURN ((LM_ERROR, "Not received send\n"), 1);
     }
   }
-  catch (CORBA::Exception& e)
+  catch (const CORBA::Exception& e)
   {
     e._tao_print_exception ("Exception caught:");
     return 1;
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.cpp b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
index b02ac88377b..ff6d2ceca0e 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.cpp
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
@@ -74,7 +74,7 @@ do_main (int argc, ACE_TCHAR *argv[], orbs_check_callback check)
                             1);
         }
     }
-  catch (CORBA::Exception const &ex)
+  catch (const CORBA::Exception const &ex)
     {
       ex._tao_print_exception ("Caught Exception in do_main:\n");
       return 1;
diff --git a/TAO/tests/Bug_3755_Regression/server.cpp b/TAO/tests/Bug_3755_Regression/server.cpp
index 692792be9b5..d1ecc42e681 100644
--- a/TAO/tests/Bug_3755_Regression/server.cpp
+++ b/TAO/tests/Bug_3755_Regression/server.cpp
@@ -198,7 +198,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // END priority mapping demonstration
     }
-  catch (CORBA::SystemException const &sysEx)
+  catch (const CORBA::SystemException const &sysEx)
     {
       sysEx._tao_print_exception ("Caught SystemException in main:\n");
       return 1;
diff --git a/TAO/tests/Bug_3826_Regression/server.cpp b/TAO/tests/Bug_3826_Regression/server.cpp
index 012ab8304cf..15e8bd4e8fb 100644
--- a/TAO/tests/Bug_3826_Regression/server.cpp
+++ b/TAO/tests/Bug_3826_Regression/server.cpp
@@ -110,7 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   ACE_TEXT ("'-ORBConnectionCacheMax' is applied to the first ")
                   ACE_TEXT ("ORB only as expected.\n")));
     }
-  catch (CORBA::Exception const &ex)
+  catch (const CORBA::Exception const &ex)
     {
       ex._tao_print_exception ("Caught Exception in main:\n");
       return 1;
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
index 5985ba7ea30..3bd849e1337 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
@@ -43,11 +43,11 @@ Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       user_name_as_any >>= name;
       ACE_DEBUG ((LM_DEBUG,  "User's name: %C\n", name));
     }
-  catch (CORBA::SystemException &ex)
+  catch (const CORBA::SystemException &ex)
     {
       ex._tao_print_exception ("ERROR");
     }
-  catch (CORBA::Exception &e)
+  catch (const CORBA::Exception &e)
     {
       e._tao_print_exception ("ERROR");
     }
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
index 7569e6ddb7b..24f82132b28 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
@@ -44,7 +44,7 @@ Client_Task::svc (void)
 
           hello->shutdown ();
         }
-      catch (CORBA::INTERNAL)
+      catch (const CORBA::INTERNAL)
         {
           exception = true;
           ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n"));
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
index 7569e6ddb7b..24f82132b28 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
@@ -44,7 +44,7 @@ Client_Task::svc (void)
 
           hello->shutdown ();
         }
-      catch (CORBA::INTERNAL)
+      catch (const CORBA::INTERNAL)
         {
           exception = true;
           ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n"));
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index 1e226a75c7a..f3095a294db 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -107,7 +107,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       orb_thread.wait();
       Orb->destroy ();
     } //destructor of ACE_Thread_Manager = implicit join
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "Corba Exception: %s\n", ex._info ().c_str ()));
       return 1;
@@ -126,7 +126,7 @@ OrbRunThread (void *arg)
     {
       Orb->run ();
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR,
                   "In OrbRunThread: Corba Exception: %s\n",
@@ -152,7 +152,7 @@ TestThread (void *arg)
             ACE_DEBUG ((LM_INFO, "(%t) collocated call returned\n"));
         }
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR,
                   "In TestThread: Corba Exception: %s\n",
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index 828b3f6082b..aab58a55d1e 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -141,7 +141,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->run ();
     }
-  catch (CORBA::Exception& ex)
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "Corba Exception: %s\n", ex._info ().c_str ()));
       return 1;
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index b04a0294fc7..dd3d210a593 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -32,7 +32,7 @@ DII_ReplyHandler::handle_response (TAO_InputCDR &incoming)
       else
         ACE_ERROR ((LM_ERROR,"ERROR: Response is not a string!\n"));
     }
-  catch (CORBA::SystemException &ex)
+  catch (const CORBA::SystemException &ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: DII_ReplyHandler::handle_response caught %C\n",
diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp
index a299e0124c0..e8a310cb9cb 100644
--- a/TAO/tests/DII_AMI_Forward/client.cpp
+++ b/TAO/tests/DII_AMI_Forward/client.cpp
@@ -74,7 +74,7 @@ do_primary_test (CORBA::Object_var &server,
         CORBA::Any::from_string(test_string.in(),30);
       req->sendc(callback.in());
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "Client caught exception: %C\n",ex._name()));
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
index cf163876400..be02cf356e5 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
@@ -47,7 +47,7 @@ My_DII_Reply_Handler::handle_response(TAO_InputCDR &incoming)
                                              0 // result
                                             );
     }
-    catch (CORBA::SystemException &ex)
+    catch (const CORBA::SystemException &ex)
     {
       // in this case the response originates locally so we
       // need to reset the byte order again
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
index 28960ed7903..ff8b42ea470 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
@@ -38,7 +38,7 @@ MT_Requestor::svc ()
                       ACE_TEXT ("Client thread %t delay succeeded\n")));
           break;
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Client thread %t caught %s\n"),
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
index bb2cc17034f..b9b61436a4f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
@@ -181,7 +181,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               else
                 break;
             }
-          catch (CORBA::TRANSIENT &)
+          catch (const CORBA::TRANSIENT &)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT("Client: got a transient exception with %d tries remaining\n"),
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
index bb2cc17034f..b9b61436a4f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
@@ -181,7 +181,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               else
                 break;
             }
-          catch (CORBA::TRANSIENT &)
+          catch (const CORBA::TRANSIENT &)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT("Client: got a transient exception with %d tries remaining\n"),
diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp
index b52acb2fa54..312ad65667a 100644
--- a/TAO/tests/MT_NoUpcall_Connect/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp
@@ -43,7 +43,7 @@ public:
       {
         excep->raise_exception ();
       }
-    catch (CORBA::Exception &)
+    catch (const CORBA::Exception &)
       {
       }
     ACE_DEBUG ((LM_DEBUG, "exception caught on upcall req\n"));
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 67d1c39ae4d..9cc69f36f8b 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       server->shutdown ();
     }
-  catch (CORBA::SystemException &ex)
+  catch (const CORBA::SystemException &ex)
     {
       ex._tao_print_exception ("Caught exception:");
       return 1;
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 99722ee799d..3006f8dfe10 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  catch (CORBA::SystemException &ex)
+  catch (const CORBA::SystemException &ex)
     {
       ex._tao_print_exception ("Caught exception:");
       return 1;
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index 73d788b8405..7b516f83f14 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -271,7 +271,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_NONE\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood && flush_strategy_ == BLOCKING) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected a timeout was received for SYNC_NONE.\n"));
     }
@@ -317,7 +317,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_EAGER_BUFFERING\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood && flush_strategy_ == BLOCKING) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected a timeout was received for SYNC_EAGER_BUFFERING\n"));
     }
@@ -353,7 +353,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_DELAYED_BUFFERING\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood && flush_strategy_ == BLOCKING) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected timeout received for SYNC_DELAYED_BUFFERING\n"));
     }
@@ -397,7 +397,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_WITH_TRANSPORT\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected Timeout received for SYNC_WITH_TRANSPORT\n"));
     }
@@ -434,7 +434,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_WITH_SERVER\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected Timeout received for SYNC_WITH_SERVER\n"));
     }
@@ -472,7 +472,7 @@ Client::test_oneway_timeout (bool flood)
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) As expected no Timeout received for SYNC_WITH_TARGET\n"));
     }
   }
-  catch (CORBA::TIMEOUT&) {
+  catch (const CORBA::TIMEOUT&) {
     if (flood) {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected Timeout received for SYNC_WITH_TARGET\n"));
     }
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 5f8e921a5d0..e11fea62581 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -399,7 +399,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
                 }
 
             }
-          catch (CORBA::TRANSIENT&)
+          catch (const CORBA::TRANSIENT&)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "Transient exception during test () invocation %d\n",
@@ -409,7 +409,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
               else
                 throw;
             }
-          catch (CORBA::TIMEOUT&)
+          catch (const CORBA::TIMEOUT&)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "Timeout exception during test () invocation %d\n",
@@ -509,7 +509,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
 
       return 0;
     }
-  catch (CORBA::TRANSIENT &)
+  catch (const CORBA::TRANSIENT &)
     {
       ACE_DEBUG ((LM_DEBUG, "caught transient exception\n"));
       if (force_timeout)
@@ -548,7 +548,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
           ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1);
         }
     }
-  catch (CORBA::TIMEOUT &)
+  catch (const CORBA::TIMEOUT &)
     {
       ACE_DEBUG ((LM_DEBUG, "caught timeout exception\n"));
       if (force_timeout)
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index 560ff0b3c99..3de5af50ebf 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -323,7 +323,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
 
       return 0;
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("server:");
     }
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index dc65656f201..8e6bc1ccd34 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -221,7 +221,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       poa_manager_factory
         = root_poa->the_POAManagerFactory ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception("initialization error ");
       return 1;
@@ -261,7 +261,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                              "defaulted hostname, but didn't.\n"),1);
         }
     }
-  catch (CORBA::PolicyError &)
+  catch (const CORBA::PolicyError &)
     {
       if (host_form == use_defaulted)
         {
@@ -272,7 +272,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                          "ERROR: Unexpectedly caught PolicyError "
                          "exception host_form = %s\n", form_arg), 1);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Failed to create reachable POA manager");
       return 1;
@@ -288,7 +288,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       bad_pm = poa_manager_factory->create_POAManager ("badPOAManager",
                                                         policies);
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Failed to create unreachable POA manager");
       return 1;
@@ -343,7 +343,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
         }
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("cannot run server");
     }
@@ -353,7 +353,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("CORBA exception during shutdown");
     }
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 334c891307a..8bf6bd1c5e1 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -88,7 +88,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           test2->method ();
         }
-      catch (CORBA::Exception &ex)
+      catch (const CORBA::Exception &ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("caught expected %s\n"),
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index decc97863f3..081c27e4a6b 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -71,7 +71,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req)
 
       *o3->value () >>= this->out_;
     }
-  catch (CORBA::UnknownUserException& user_ex)
+  catch (const CORBA::UnknownUserException& user_ex)
     {
       Param_Test::Ooops* oops;
       Param_Test::BadBoy* bad_boy;
diff --git a/TAO/tests/Storable/test.cpp b/TAO/tests/Storable/test.cpp
index 34763e731f7..bb57d1adde0 100644
--- a/TAO/tests/Storable/test.cpp
+++ b/TAO/tests/Storable/test.cpp
@@ -191,7 +191,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       exit_status = 1;
     }
 
-  catch (CORBA::PERSIST_STORE &)
+  catch (const CORBA::PERSIST_STORE &)
     {
       std::cout << "CORBA::PERSIST_STORE thrown" << std::endl;
       exit_status = 1;
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index a0c28a6f40c..9895a7b8a02 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -69,7 +69,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           test->unknown_exception_in_method ();
         }
-      catch (CORBA::UNKNOWN)
+      catch (const CORBA::UNKNOWN)
         {
           unknown_exception_raised = 1;
 
diff --git a/TAO/utils/monitor/monitor_client.cpp b/TAO/utils/monitor/monitor_client.cpp
index 69ed3c43e12..3bb2643e476 100644
--- a/TAO/utils/monitor/monitor_client.cpp
+++ b/TAO/utils/monitor/monitor_client.cpp
@@ -152,7 +152,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->destroy ();
     }
-  catch (CORBA::Exception &ex)
+  catch (const CORBA::Exception &ex)
     {
       ex._tao_print_exception ("Monitor_client: Exception caught:");
       return 1;
author	Johnny Willemsen <jwillemsen@remedy.nl>	2014-12-11 14:26:56 +0100
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2014-12-11 14:26:56 +0100
commit	39668e74d887084a2295d7cf3d445e7c42d7704e (patch)
tree	32b3862b94313e8abc5a7a2b45d8b6bced090426
parent	cce2446f02f2e85d78067ff696b5d2c212de3ad4 (diff)
download	ATCD-39668e74d887084a2295d7cf3d445e7c42d7704e.tar.gz