*** empty log message ***

3 files changed, 19 insertions, 6 deletions

diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 3e71c0f4f14..cc7c2c09451 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -56,14 +56,15 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     response_expected_ (false),
     deferred_reply_ (false),
     sync_with_server_ (false),
+    is_dsi_ (false),
     // @@ We shouldn't be using GIOP specific types here. Need to be revisited.
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
     request_id_ (0),
     profile_ (orb_core),
     requesting_principal_ (0),
-    is_dsi_ (false),
     dsi_nvlist_align_ (0),
+    operation_details_ (0),
     argument_flag_ (1)
 #if TAO_HAS_INTERCEPTORS == 1
     , interceptor_count_ (0)
@@ -97,13 +98,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     response_expected_ (response_expected),
     deferred_reply_ (deferred_reply),
     sync_with_server_ (false),
+    is_dsi_ (false),
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
     request_id_ (request_id),
     profile_ (orb_core),
     requesting_principal_ (0),
-    is_dsi_ (false),
     dsi_nvlist_align_ (0),
+    operation_details_ (0),
     argument_flag_ (true)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
@@ -129,13 +131,14 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
                         || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_TARGET)),
     deferred_reply_ (false),
     sync_with_server_ (details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_SERVER)),
+    is_dsi_ (false),
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
     request_id_ (0),
     profile_ (orb_core),
     requesting_principal_ (0),
-    is_dsi_ (false),
     dsi_nvlist_align_ (0),
+    operation_details_ (&details),
     argument_flag_ (false)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 61988689946..5b4f6304514 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -211,6 +211,8 @@ public:
   /// Set the member.
   void dsi_nvlist_align (ptrdiff_t alignment);
 
+  TAO_Operation_Details const * operation_details (void) const;
+
   /// Get/Set operations for the argument_flag
   void argument_flag (CORBA::Boolean flag);
   CORBA::Boolean argument_flag (void);
@@ -277,6 +279,9 @@ private:
   /// 0: anything else
   CORBA::Boolean sync_with_server_;
 
+  /// Did we get passed to a CORBA::ServerRequest?
+  CORBA::Boolean is_dsi_;
+
   //  TAO_GIOP_ReplyStatusType exception_type_;
   /// Exception type (will be NO_EXCEPTION in the majority of the cases).
   CORBA::ULong exception_type_;
@@ -298,12 +303,11 @@ private:
   /// Identifies the requester.
   CORBA::OctetSeq_var requesting_principal_;
 
-  /// Did we get passed to a CORBA::ServerRequest?
-  CORBA::Boolean is_dsi_;
-
   /// Used to pad CDR stream if we have used DSI.
   ptrdiff_t dsi_nvlist_align_;
 
+  TAO_Operation_Details const * const operation_details_;
+
   /**
    * An argument flag to indicate whether there is any data that is
    * going to get marshalled along as a reply. The default will be 1
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index a3b922fce91..82f4a9cf919 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -168,6 +168,12 @@ TAO_ServerRequest::is_dsi (void)
   this->is_dsi_ = 1;
 }
 
+ACE_INLINE TAO_Operation_Details const *
+TAO_ServerRequest::operation_details (void) const
+{
+  return this->operation_details_;
+}
+
 ACE_INLINE void
 TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment)
 {