diff options
Diffstat (limited to 'TAO/tao/Messaging')
| -rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 45 | ||||
| -rw-r--r-- | TAO/tao/Messaging/ExceptionHolder_i.cpp | 62 | ||||
| -rw-r--r-- | TAO/tao/Messaging/ExceptionHolder_i.h | 75 |
3 files changed, 23 insertions, 159 deletions
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 4c190f27612..7d8710b6fac 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -48,25 +48,25 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) { return; } - } - // If sending the exception to the client fails, then we just give - // up, release the transport and return. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code - (TAO_AMH_REPLY_LOCATION_CODE, - EFAULT), - CORBA::COMPLETED_NO); - this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - } - ACE_ENDTRY; - ACE_CHECK; + // If sending the exception to the client fails, then we just give + // up, release the transport and return. + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code + (TAO_AMH_REPLY_LOCATION_CODE, + EFAULT), + CORBA::COMPLETED_NO); + this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + } + ACE_ENDTRY; + ACE_CHECK; + } } void @@ -186,10 +186,10 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex if (this->reply_status_ != TAO_RS_UNINITIALIZED) { ACE_THROW (CORBA::BAD_INV_ORDER ( - CORBA::SystemException::_tao_minor_code ( - TAO_AMH_REPLY_LOCATION_CODE, - ENOTSUP), - CORBA::COMPLETED_YES)); + CORBA::SystemException::_tao_minor_code ( + TAO_AMH_REPLY_LOCATION_CODE, + ENOTSUP), + CORBA::COMPLETED_YES)); } this->reply_status_ = TAO_RS_SENDING; } @@ -259,3 +259,4 @@ namespace TAO (void) arh->_remove_ref (); } } + diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp deleted file mode 100644 index d49d870cb82..00000000000 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "tao/Messaging/ExceptionHolder_i.h" - -ACE_RCSID (Messaging, - ExceptionHolder_i, - "$Id$") - -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -#include "tao/Messaging/Messaging.h" - -namespace TAO -{ - ExceptionHolder::ExceptionHolder ( - ::CORBA::Boolean is_system_exception, - ::CORBA::Boolean byte_order, - const ::CORBA::OctetSeq &marshaled_exception, - ::TAO::Exception_Data* data, - ::CORBA::ULong exceptions_count) : - ::OBV_Messaging::ExceptionHolder (), - ::CORBA::DefaultValueRefCountBase (), - data_ (data), - count_ (exceptions_count) - { - // @todo According to the latest corba spec we should be able to - // pass this to the ExceptionHolder constructor but the TAO_IDL - // compiler doesn't seem to generate this. - this->is_system_exception (is_system_exception); - this->byte_order (byte_order); - this->marshaled_exception (marshaled_exception); - } - - ExceptionHolder::~ExceptionHolder () - { - } - - void ExceptionHolder::raise_exception ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - { - TAO_Messaging_Helper::exception_holder_raise ( - this->data_, - this->count_, - this->marshaled_exception ().get_buffer (), - this->marshaled_exception ().length (), - this->byte_order (), - this->is_system_exception () - ACE_ENV_ARG_PARAMETER); - } - - void ExceptionHolder::raise_exception_with_list ( - const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - { - // todo convert exceptionlist to something we can really use. - this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - } -} - -#endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h deleted file mode 100644 index c2b6ce86b3f..00000000000 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ /dev/null @@ -1,75 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ExceptionHolder_i.h - * - * $Id$ - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - -#ifndef TAO_MESSAGING_EXCEPTIONHOLDER_I_H -#define TAO_MESSAGING_EXCEPTIONHOLDER_I_H -#include /**/ "ace/pre.h" - -#include "tao/Messaging/messaging_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/orbconf.h" - -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -#include "tao/Messaging/ExceptionHolderA.h" -#include "tao/Messaging/ExceptionHolderC.h" - -namespace Dynamic -{ - class ExceptionList; -} - -namespace Messaging -{ - class ReplyHandler; -} - -namespace TAO -{ - class Exception_Data; - - class TAO_Messaging_Export ExceptionHolder - : public virtual ::OBV_Messaging::ExceptionHolder, - public virtual ::CORBA::DefaultValueRefCountBase - { - public: - ExceptionHolder ( - ::CORBA::Boolean is_system_exception, - ::CORBA::Boolean byte_order, - const ::CORBA::OctetSeq &marshaled_exception, - ::TAO::Exception_Data* data_, - ::CORBA::ULong exceptions_count - ); - - virtual ~ExceptionHolder (); - - virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - - virtual void raise_exception_with_list ( - const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - private: - TAO::Exception_Data* data_; - CORBA::ULong count_; - }; -} - -#endif - -#include /**/ "ace/post.h" -#endif /* TAO_MESSAGING_EXCEPTIONHOLDER_I_H */ - |