Merge pull request #649 from jwillemsen/jwi-catchbyref

Catch exceptions by reference, not by value

11 files changed, 15 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index 5b6e3eb3f15..9bb5cb60097 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -75,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
           result = 1;
         }
-      catch (const 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/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
index a1a3408ed4a..d0732208090 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
@@ -38,7 +38,7 @@ public:
         try {
           group_svc.member_list (group_names[g]);
         }
-        catch (PortableGroup::ObjectGroupNotFound) {
+        catch (PortableGroup::ObjectGroupNotFound&) {
           }
         catch (CORBA::Exception &ex) {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index cc8af3b58e1..8390c42fd8c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -115,7 +115,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       proxySupplier_obj = ca->obtain_notification_push_supplier(ctype, proxy_id);
     }
-    catch(CosNotifyChannelAdmin::AdminLimitExceeded err)
+    catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
     {
       std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
       throw;
@@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       pps->connect_structured_push_consumer(spc.in());
     }
-    catch (CosEventChannelAdmin::AlreadyConnected ac)
+    catch (CosEventChannelAdmin::AlreadyConnected& ac)
     {
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 953f44ea5f2..6f110389e8b 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -96,7 +96,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter,
   try{
     bResult = filter->match_structured(event);
   }
-  catch(CosNotifyFilter::UnsupportedFilterableData)
+  catch(CosNotifyFilter::UnsupportedFilterableData&)
   {
     std::cerr << "UnsupportedFilterableData!" << 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 821e496afbd..a97114e1d40 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -57,7 +57,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id);
     }
-    catch(CosNotifyChannelAdmin::AdminLimitExceeded err)
+    catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
     {
       std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
       throw;
@@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ppc->connect_structured_push_supplier(sps.in());
     }
-    catch (CosEventChannelAdmin::AlreadyConnected ac)
+    catch (CosEventChannelAdmin::AlreadyConnected& ac)
     {
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index 3c46b033d58..126007ce526 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -114,7 +114,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       proxySupplier_obj = ca->obtain_notification_push_supplier(ctype, proxy_id);
     }
-    catch(CosNotifyChannelAdmin::AdminLimitExceeded err)
+    catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
     {
       std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
       throw;
@@ -163,7 +163,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       pps->connect_structured_push_consumer(spc.in());
     }
-    catch (CosEventChannelAdmin::AlreadyConnected ac)
+    catch (CosEventChannelAdmin::AlreadyConnected& ac)
     {
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 50088af13f4..9aa4bca5e30 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id);
     }
-    catch(CosNotifyChannelAdmin::AdminLimitExceeded err)
+    catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
     {
       std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
       throw;
@@ -73,7 +73,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ppc->connect_structured_push_supplier(sps.in());
     }
-    catch (CosEventChannelAdmin::AlreadyConnected ac)
+    catch (CosEventChannelAdmin::AlreadyConnected& ac)
     {
       std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
       throw;
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
index ef58f4548f7..419c8e44bbb 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
@@ -39,7 +39,7 @@ Client_Task::svc (void)
 
            hello->shutdown ();
         }
-      catch (const 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/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
index b5925ed1f44..8199914c81f 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
@@ -41,7 +41,7 @@ Client_Task::svc (void)
 
           hello->shutdown ();
         }
-      catch (const 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 b5925ed1f44..8199914c81f 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
@@ -41,7 +41,7 @@ Client_Task::svc (void)
 
           hello->shutdown ();
         }
-      catch (const CORBA::INTERNAL)
+      catch (const CORBA::INTERNAL&)
         {
           exception = true;
           ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n"));
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index f754670339e..f7884f6c77e 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -67,7 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           test->unknown_exception_in_method ();
         }
-      catch (const CORBA::UNKNOWN)
+      catch (const CORBA::UNKNOWN&)
         {
           unknown_exception_raised = 1;