summaryrefslogtreecommitdiff
path: root/TAO/tao/PI_Server/ServerRequestInfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PI_Server/ServerRequestInfo.cpp')
-rw-r--r--TAO/tao/PI_Server/ServerRequestInfo.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 86f738fac4d..b7d6238660e 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
CORBA::ULong
TAO::ServerRequestInfo::request_id (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// The request ID returned by this method need not correspond to the
// GIOP request ID sent with the client request. The request ID
@@ -72,14 +71,12 @@ TAO::ServerRequestInfo::request_id (void)
char *
TAO::ServerRequestInfo::operation (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->server_request_.operation ());
}
Dynamic::ParameterList *
TAO::ServerRequestInfo::arguments (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->args_ == 0)
{
@@ -118,7 +115,6 @@ TAO::ServerRequestInfo::arguments (void)
Dynamic::ExceptionList *
TAO::ServerRequestInfo::exceptions (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->args_ == 0)
{
@@ -149,21 +145,18 @@ TAO::ServerRequestInfo::exceptions (void)
Dynamic::ContextList *
TAO::ServerRequestInfo::contexts (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
}
Dynamic::RequestContext *
TAO::ServerRequestInfo::operation_context (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
}
CORBA::Any *
TAO::ServerRequestInfo::result (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->args_ == 0)
{
@@ -189,14 +182,12 @@ TAO::ServerRequestInfo::result (void)
CORBA::Boolean
TAO::ServerRequestInfo::response_expected (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->server_request_.response_expected ();
}
Messaging::SyncScope
TAO::ServerRequestInfo::sync_scope (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->server_request_.sync_with_server ())
return Messaging::SYNC_WITH_SERVER;
@@ -206,7 +197,6 @@ TAO::ServerRequestInfo::sync_scope (void)
PortableInterceptor::ReplyStatus
TAO::ServerRequestInfo::reply_status (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->server_request_.reply_status () == -1)
// A reply hasn't been received yet.
@@ -217,7 +207,6 @@ TAO::ServerRequestInfo::reply_status (void)
CORBA::Object_ptr
TAO::ServerRequestInfo::forward_reference (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD)
throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
@@ -229,8 +218,6 @@ TAO::ServerRequestInfo::forward_reference (void)
CORBA::Any *
TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::InvalidSlot))
{
// Retrieve the total number of assigned slots from the PICurrent.
// No TSS access is incurred.
@@ -254,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
IOP::ServiceContext *
TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Service_Context &service_context_list =
this->server_request_.request_service_context ();
@@ -264,7 +250,6 @@ TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
IOP::ServiceContext *
TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Service_Context & service_context_list =
this->server_request_.reply_service_context ();
@@ -277,7 +262,6 @@ TAO::ServerRequestInfo::get_service_context_i (
TAO_Service_Context & service_context_list,
IOP::ServiceId id
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
IOP::ServiceContext_var service_context;
@@ -298,7 +282,6 @@ TAO::ServerRequestInfo::get_service_context_i (
// with the spec.
CORBA::Any *
TAO::ServerRequestInfo::sending_exception (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
&& this->server_request_.reply_status () != PortableInterceptor::USER_EXCEPTION)
@@ -330,7 +313,6 @@ TAO::ServerRequestInfo::sending_exception (void)
char *
TAO::ServerRequestInfo::server_id (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
return
@@ -341,7 +323,6 @@ TAO::ServerRequestInfo::server_id (void)
char *
TAO::ServerRequestInfo::orb_id (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
return
@@ -352,7 +333,6 @@ TAO::ServerRequestInfo::orb_id (void)
PortableInterceptor::AdapterName *
TAO::ServerRequestInfo::adapter_name (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// The adapter_name attribute defines a name for the object adapter
// that services requests for the invoked object. In the case of the
@@ -368,7 +348,6 @@ TAO::ServerRequestInfo::adapter_name (void)
PortableInterceptor::ObjectId *
TAO::ServerRequestInfo::object_id (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
{
@@ -408,7 +387,6 @@ TAO::ServerRequestInfo::object_id (void)
CORBA::OctetSeq *
TAO::ServerRequestInfo::adapter_id (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
return this->servant_upcall_->poa ().id ();
@@ -419,7 +397,6 @@ TAO::ServerRequestInfo::adapter_id (void)
char *
TAO::ServerRequestInfo::target_most_derived_interface (
void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::Servant const servant =
(this->servant_upcall_ == 0
@@ -435,9 +412,7 @@ TAO::ServerRequestInfo::target_most_derived_interface (
}
CORBA::Policy_ptr
-TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
- )
- ACE_THROW_SPEC ((CORBA::SystemException))
+TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type)
{
if (this->servant_upcall_ != 0)
{
@@ -465,8 +440,6 @@ void
TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
const CORBA::Any &data
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableInterceptor::InvalidSlot))
{
// Retrieve the total number of assigned slots from the PICurrent
// object. No TSS access is incurred.
@@ -490,7 +463,6 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
CORBA::Boolean
TAO::ServerRequestInfo::target_is_a (const char * id
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Implemented in the generated skeleton.
@@ -514,7 +486,6 @@ TAO::ServerRequestInfo::add_reply_service_context (
const IOP::ServiceContext & service_context,
CORBA::Boolean replace
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get the service context from the list
TAO_Service_Context &service_context_list =
View Lorry Controller Status