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:

45 files changed, 70 insertions, 70 deletions

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;