From c008221be290196dc1fe6a34e62af160805d93d3 Mon Sep 17 00:00:00 2001 From: zhangw Date: Fri, 2 Mar 2007 20:46:54 +0000 Subject: Fri Mar 2 20:31:11 UTC 2007 Wallace Zhang --- TAO/ChangeLog | 15 +++++++++++++++ TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp | 3 +-- TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h | 1 - TAO/tao/Messaging/AMH_Response_Handler.cpp | 4 ++-- TAO/tao/Messaging/AMH_Response_Handler.h | 18 ++++++++---------- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a9691a8e55c..eaa134f4c70 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Fri Mar 2 20:31:11 UTC 2007 Wallace Zhang + + * tao/DynamicInterface/AMH_DSI_Response_Handler.h: + * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + + Don't need the exception_type_ data memember. + It is inherited from its parent class AMH_Response_Handler. + + * tao/Messaging/AMH_Response_Handler.h: + * tao/Messaging/AMH_Response_Handler.cpp: + + Move the exception_type_ from private section to protected section. + so that the AMH_DSI_Response_Handler as a child class can access + this data member. + Fri Mar 2 18:45:34 UTC 2007 Wallace Zhang * tao/DynamicInterface/AMH_DSI_Response_Handler.inl: diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 37fc50aca96..aea071fcfe3 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -314,8 +314,7 @@ TAO_AMH_DSI_Response_Handler::_nil (void) TAO_AMH_DSI_Response_Handler::TAO_AMH_DSI_Response_Handler ( TAO_ServerRequest & sr) : TAO_AMH_Response_Handler (), - orb_core_ (sr.orb_core ()), - exception_type_ (TAO_GIOP_NO_EXCEPTION) + orb_core_ (sr.orb_core ()) { } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h index 0a230184407..8f6af4aa735 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h @@ -251,7 +251,6 @@ protected: private: TAO_ORB_Core *orb_core_; - CORBA::ULong exception_type_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 3dd8a60de50..c8df60412ba 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -18,12 +18,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () - : mesg_base_ (0) + : exception_type_ (TAO_GIOP_NO_EXCEPTION) + , mesg_base_ (0) , request_id_ (0) , transport_ (0) , orb_core_ (0) , argument_flag_ (1) - , exception_type_ (TAO_GIOP_NO_EXCEPTION) , reply_status_ (TAO_RS_UNINITIALIZED) , allocator_ (0) { diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 5f9eb5d0574..ac869cdea24 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -107,8 +107,6 @@ protected: /// Send back an exception to the client. void _tao_rh_send_exception (const CORBA::Exception &ex); -protected: - /// The outgoing CDR stream /** * The IDL-generated ResponseHandler implementations used this field @@ -118,13 +116,20 @@ protected: */ TAO_OutputCDR _tao_out; + // TAO_GIOP_ReplyStatusType exception_type_; + /// Exception type (will be NO_EXCEPTION in the majority of the + /// cases). + // @@ Mayur: I do not think we need this one, we can deduce the type + // of reply depending on the _tao_rh_*() method called. + CORBA::ULong exception_type_; + + private: // Private and undefined, standard C++ idiom to prohibit copying. TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&); TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&); -private: /// Pointer to the original message-base TAO_Pluggable_Messaging *mesg_base_; @@ -153,13 +158,6 @@ private: // ResponseHandler to set this field correctly! CORBA::Boolean argument_flag_; - // TAO_GIOP_ReplyStatusType exception_type_; - /// Exception type (will be NO_EXCEPTION in the majority of the - /// cases). - // @@ Mayur: I do not think we need this one, we can deduce the type - // of reply depending on the _tao_rh_*() method called. - CORBA::ULong exception_type_; - /** * Various states the ResponseHandler can be in. * -- cgit v1.2.1