summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-12-08 19:39:28 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-12-08 19:39:28 +0100
commit6c1efa7b1cea288d9850857b871f8f2ab8b4aecc (patch)
tree6ae4a2ea1f88b9ab0358b89457baf8161a180fd7
parent5ed9067deb2728b38cddf4bae0683b831a99771c (diff)
downloadATCD-6c1efa7b1cea288d9850857b871f8f2ab8b4aecc.tar.gz
Catch all exceptions as const&
* TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp: * TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp: * TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp: * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp12
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp10
4 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index df811723224..36ed0e3ba1a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -119,7 +119,7 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter
ServerInformationIterator::_unchecked_narrow (obj.in ());
return true;
}
- catch (CORBA::SystemException& ex)
+ catch (const CORBA::SystemException& ex)
{
ex._tao_print_exception ("AsyncListManager:final state constructing iterator\n");
ImplementationRepository::AMH_AdministrationExceptionHolder h (ex._tao_duplicate());
@@ -127,12 +127,12 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter
{
this->primary_->list_excep (&h);
}
- catch (CORBA::Exception& ex2)
+ catch (const CORBA::Exception& ex2)
{
ex2._tao_print_exception ("AsyncListManager:final calling list_excep\n");
}
}
- catch (CORBA::UserException& ex)
+ catch (const CORBA::UserException& ex)
{
ex._tao_print_exception ("AsyncListManager:final state constructing iterator\n");
ImplementationRepository::AMH_AdministrationExceptionHolder h (new CORBA::INTERNAL);
@@ -140,7 +140,7 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter
{
this->primary_->list_excep (&h);
}
- catch (CORBA::Exception& ex2)
+ catch (const CORBA::Exception& ex2)
{
ex2._tao_print_exception ("AsyncListManager:final calling list_excep\n");
}
@@ -197,7 +197,7 @@ AsyncListManager::final_state (void)
{
this->primary_->list (*sil, server_iterator.in ());
}
- catch (CORBA::Exception &ex)
+ catch (const CORBA::Exception &ex)
{
ex._tao_print_exception ("AsyncListManager:final state sending list\n");
ImplementationRepository::AMH_AdministrationExceptionHolder h (ex._tao_duplicate());
@@ -214,7 +214,7 @@ AsyncListManager::final_state (void)
{
this->secondary_->next_n (done, *sil);
}
- catch (CORBA::Exception &ex)
+ catch (const CORBA::Exception &ex)
{
ex._tao_print_exception ("AsyncListManager:final state sending secondary list\n");
ImplementationRepository::AMH_ServerInformationIteratorExceptionHolder h (ex._tao_duplicate());
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 7a5466bdf5b..b936a7d21de 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -88,7 +88,7 @@ ImR_DSI_Forwarder::_dispatch (TAO_ServerRequest &request,
// Delegate to user.
this->invoke (dsi_request, rh.in());
}
- catch (CORBA::Exception& ex)
+ catch (const CORBA::Exception& ex)
{
// Only if the client is waiting.
if (request.response_expected () && !request.sync_with_server ())
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 3528ad269a2..0cb69b4483f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -30,7 +30,7 @@ INS_Locator::locate (const char* object_key)
this->imr_locator_.activate_server_by_object (object_key);
return located._retn();
}
- catch (CORBA::Exception &)
+ catch (const CORBA::Exception &)
{
throw CORBA::TRANSIENT (CORBA::SystemException::_tao_minor_code
(TAO_IMPLREPO_MINOR_CODE, 0),
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index f6122cdc77c..3ec2ffc78ee 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -437,7 +437,7 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa)
ACE_TEXT ("sendc_ping returned OK\n")));
}
}
- catch (CORBA::Exception &ex)
+ catch (const CORBA::Exception &ex)
{
if (ImR_Locator_i::debug () > 3)
{
@@ -483,7 +483,7 @@ PingReceiver::cancel (void)
PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
poa_->deactivate_object (oid.in());
}
- catch (CORBA::Exception &ex)
+ catch (const CORBA::Exception &ex)
{
if (ImR_Locator_i::debug () > 4)
{
@@ -526,7 +526,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder)
}
excep_holder->raise_exception ();
}
- catch (CORBA::TRANSIENT &ex)
+ catch (const CORBA::TRANSIENT &ex)
{
switch (ex.minor () & TAO_MINOR_MASK)
{
@@ -550,7 +550,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder)
}
}
}
- catch (CORBA::TIMEOUT &ex)
+ catch (const CORBA::TIMEOUT &ex)
{
if (this->entry_ != 0)
{
@@ -565,7 +565,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder)
}
}
}
- catch (CORBA::Exception &)
+ catch (const CORBA::Exception &)
{
if (this->entry_ != 0)
{