Consolidated request_service_info and reply_service_info to simply service_info.

12 files changed, 46 insertions, 77 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index b9b72a017c3..853a8c0df96 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -796,7 +796,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       *os << "1";
     }
   *os << ", this, " << this->compute_operation_name (node)
-      << ", _tao_call.request_service_info (), "
+      << ", _tao_call.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV));\n";
   if (this->gen_check_interceptor_exception (bt) == -1)
     {
@@ -1028,7 +1028,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       *os << "1";
     }
   *os << ", this, " << this->compute_operation_name (node)
-      << ", _tao_call.reply_service_info (), "
+      << ", _tao_call.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV));\n";
   if (this->gen_check_interceptor_exception (bt) == -1)
     {
@@ -1059,7 +1059,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       *os << "1";
     }
   *os << ", this, " << this->compute_operation_name (node)
-      << ", " // _tao_call.reply_service_info (), "
+      << ", " // _tao_call.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV);" << be_nl
       << "ACE_RETHROW;" << be_uidt_nl
       << "}" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index f2a994b7de8..28324fa0e66 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -115,19 +115,9 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
         *os << "_get_";
     }
   *os << node->local_name ()
-      << "_skel (" << be_idt << be_idt_nl;
-
-  if (node->flags () == AST_Operation::OP_oneway
-      && !this->has_param_type (node, AST_Argument::dir_IN))
-    {
-      *os << "CORBA::ServerRequest &/* _tao_server_request */, " << be_nl;
-    }
-  else
-    {
-      *os << "CORBA::ServerRequest &_tao_server_request, " << be_nl;
-    }
-
-  *os << "void *_tao_object_reference, " << be_nl
+      << "_skel (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &_tao_server_request," << be_nl
+      << "void *_tao_object_reference, " << be_nl
       << "void * /* context */, " << be_nl
       << "CORBA::Environment &ACE_TRY_ENV" << be_uidt << be_uidt_nl
       << ")" << be_nl;
@@ -204,10 +194,17 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   else
     *os << "1";
   *os << ", 0, " << this->compute_operation_name (node)
-      << ", _tao_server_request.request_service_info (), "
+      << ", _tao_server_request.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV);" << be_nl
-      << "TAO_INTERCEPTOR_CHECK;\n"
-      << "#endif /* TAO_HAS_INTERCEPTOR */\n\n";
+      << "TAO_INTERCEPTOR_CHECK;\n";
+  if (node->flags () == AST_Operation::OP_oneway
+      && !this->has_param_type (node, AST_Argument::dir_IN))
+    {
+      *os << "#else" << be_nl
+          << "ACE_UNUSED_ARG (_tao_server_request);\n";
+    }
+
+  *os << "#endif /* TAO_HAS_INTERCEPTOR */\n\n";
 
   // do pre upcall processing if any
   ctx = *this->ctx_;
@@ -263,7 +260,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   else
     *os << "1";
   *os << ", 0, " << this->compute_operation_name (node)
-      << ", _tao_server_request.reply_service_info (), "
+      << ", _tao_server_request.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV);" << be_nl
       << "TAO_INTERCEPTOR_CHECK;" << be_uidt_nl
       << "}" << be_uidt_nl
@@ -275,7 +272,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   else
     *os << "1";
   *os << ", 0, " << this->compute_operation_name (node)
-      << ", "// _tao_server_request.reply_service_info (), "
+      << ", "// _tao_server_request.service_info (), "
       << "_tao_cookies, ACE_TRY_ENV);" << be_nl
       << "ACE_RETHROW;" << be_uidt_nl
       << "}" << be_uidt_nl
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index 63711ac2064..3a01c168a7d 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -62,8 +62,7 @@ TAO_GIOP_ServerRequest::
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
     version_ (version),
-    request_service_info_ (),
-    reply_service_info_ (),
+    service_info_ (),
     request_id_ (0),
     object_key_ (),
     requesting_principal_ (0)
@@ -87,7 +86,7 @@ TAO_GIOP_ServerRequest::parse_header_std (void)
 
   TAO_InputCDR& input = *this->incoming_;
 
-  input >> this->request_service_info_;
+  input >> this->service_info_;
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
   // Get the rest of the request header ...
@@ -237,8 +236,7 @@ TAO_GIOP_ServerRequest::
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
     version_ (version),
-    request_service_info_ (),
-    reply_service_info_ (),
+    service_info_ (),
     request_id_ (request_id),
     object_key_ (object_key),
     requesting_principal_ (0)
@@ -628,7 +626,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV)
                            *this->outgoing_,
                            this->orb_core_);
 
-  *this->outgoing_ << this->reply_service_info_;
+  *this->outgoing_ << this->service_info_;
   this->outgoing_->write_ulong (this->request_id_);
 
   // Standard exceptions are caught in Connect::handle_input
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index 214db61c6fd..8b2dc6834af 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -130,8 +130,7 @@ public:
 
   virtual const TAO_ObjectKey &object_key (void) const;
 
-  virtual IOP::ServiceContextList &request_service_info (void);
-  virtual IOP::ServiceContextList &reply_service_info (void);
+  virtual IOP::ServiceContextList &service_info (void);
 
   // The pseudo object methods, not really needed because the class is
   // not in the spec, but we add them for the sake of completeness.
@@ -201,11 +200,9 @@ private:
   // The version for the GIOP request, the reply must have the same
   // one.
 
-  IOP::ServiceContextList request_service_info_;
+  IOP::ServiceContextList service_info_;
   // The service context for the request (CORBA Reference?)
 
-  IOP::ServiceContextList reply_service_info_;
-
   CORBA::ULong request_id_;
   // Unique identifier for a request
 
diff --git a/TAO/tao/GIOP_Server_Request.i b/TAO/tao/GIOP_Server_Request.i
index d58fe6508d9..57edfac9630 100644
--- a/TAO/tao/GIOP_Server_Request.i
+++ b/TAO/tao/GIOP_Server_Request.i
@@ -66,15 +66,9 @@ TAO_GIOP_ServerRequest::object_key (void) const
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_GIOP_ServerRequest::request_service_info (void)
+TAO_GIOP_ServerRequest::service_info (void)
 {
-  return this->request_service_info_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_GIOP_ServerRequest::reply_service_info (void)
-{
-  return this->reply_service_info_;
+  return this->service_info_;
 }
 
 ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 0c87624dcaa..4837909b4a9 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -410,7 +410,7 @@ TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
                                    this->profile_,
                                    this->opname_,
                                    this->request_id_,
-                                   this->request_service_info_,
+                                   this->service_info_,
                                    1,
                                    this->out_stream_,
                                    ACE_TRY_ENV);
@@ -781,7 +781,7 @@ TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
                                    this->profile_,
                                    this->opname_,
                                    this->request_id_,
-                                   this->request_service_info_,
+                                   this->service_info_,
                                    0,
                                    this->out_stream_,
                                    ACE_TRY_ENV);
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 15acda94138..3b5d24aead4 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -89,7 +89,7 @@ public:
   // Encodes the value into the undelying CDR stream based on the
   // TypeCode parameter.
 
-  IOP::ServiceContextList& request_service_info (void);
+  IOP::ServiceContextList& service_info (void);
   // Accessor to the request ServiceContextList.  Only valid when
   // sending a request message.
 
@@ -162,7 +162,7 @@ protected:
   TAO_Profile *profile_;
   // This invocation is using this transport, may change...
 
-  IOP::ServiceContextList request_service_info_;
+  IOP::ServiceContextList service_info_;
   // The ServiceContextList sent to the server side.  Only valid
   // when sending a request.
 
@@ -222,9 +222,6 @@ public:
                         TAO_default_environment ());
   // No CORBA::Context support (deprecated).
 
- IOP::ServiceContextList& reply_service_info (void);
-  // Accessor to the reply ServiceContextList.
-
   TAO_InputCDR &inp_stream (void);
   // return the underlying input stream
 
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 2956cb7944d..074f0eabae7 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -12,9 +12,9 @@ TAO_GIOP_Invocation::put_param (CORBA::TypeCode_ptr tc,
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_GIOP_Invocation::request_service_info (void)
+TAO_GIOP_Invocation::service_info (void)
 {
-  return this->request_service_info_;
+  return this->service_info_;
 }
 
 ACE_INLINE CORBA::ULong
@@ -37,16 +37,10 @@ TAO_GIOP_Twoway_Invocation (TAO_Stub *stub,
                             const char *operation,
                             TAO_ORB_Core *orb_core)
   : TAO_GIOP_Invocation (stub, operation, orb_core),
-    rd_ (orb_core)
+    rd_ (orb_core, this->service_info_)
 {
 }
 
-ACE_INLINE IOP::ServiceContextList &
-TAO_GIOP_Twoway_Invocation::reply_service_info (void)
-{
-  return this->rd_.reply_service_info ();
-}
-
 ACE_INLINE TAO_InputCDR &
 TAO_GIOP_Twoway_Invocation::inp_stream (void)
 {
@@ -86,7 +80,7 @@ TAO_GIOP_Locate_Request_Invocation::
 TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub,
                                     TAO_ORB_Core *orb_core)
   : TAO_GIOP_Invocation (stub, 0, orb_core),
-    rd_ (orb_core)
+    rd_ (orb_core, this->service_info_)
 {
 }
 
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index eb60f7c469e..a7768f3af55 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -10,7 +10,6 @@
 
 // Constructor.
 TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
-  : reply_service_info_ ()
   //  : reply_received_ (0)
 {
 }
@@ -36,8 +35,10 @@ TAO_Reply_Dispatcher::leader_follower_condition_variable (TAO_Transport *)
 // *********************************************************************
 
 // Constructor.
-TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core)
-  : message_state_ (orb_core),
+TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core,
+                                                        IOP::ServiceContextList &sc)
+  : reply_service_info_ (sc),
+    message_state_ (orb_core),
     reply_received_ (0),
     leader_follower_condition_variable_ (0),
     orb_core_ (orb_core)
@@ -133,7 +134,7 @@ TAO_Synch_Reply_Dispatcher::leader_follower_condition_variable (TAO_Transport *t
 }
 
 // *********************************************************************
-#if defined (TAO_HAS_CORBA_MESSAGING) 
+#if defined (TAO_HAS_CORBA_MESSAGING)
 
 #if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
 
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index bb30fa7152c..0aff81c9d4d 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -56,17 +56,10 @@ public:
   virtual TAO_GIOP_Message_State *message_state (void);
   // Get the Message State into which the reply has been read.
 
-  IOP::ServiceContextList& reply_service_info ();
-  // Accessing the reply service context list.
-
   virtual int leader_follower_condition_variable (TAO_Transport *);
   // Obtain the condition variable used in the Leader Follower Wait
   // Strategy. This is valid only for the synchronous reply dispatcher
   // and only when the Leader Follower wait strategy is used.
-
-protected:
-  IOP::ServiceContextList reply_service_info_;
-  // The service context list
 };
 
 // *********************************************************************
@@ -81,7 +74,8 @@ class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher
   //
 
 public:
-  TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core);
+  TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core,
+                              IOP::ServiceContextList &sc);
   // Constructor.
 
   virtual ~TAO_Synch_Reply_Dispatcher (void);
@@ -118,6 +112,10 @@ public:
   // Obtain the condition variable used in the Leader Follower Wait
   // Strategy.
 
+protected:
+  IOP::ServiceContextList &reply_service_info_;
+  // The service context list
+
 private:
   CORBA::ULong reply_status_;
   // Reply or LocateReply status.
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
index b41eb0125e6..275aa179644 100644
--- a/TAO/tao/Reply_Dispatcher.i
+++ b/TAO/tao/Reply_Dispatcher.i
@@ -1,11 +1,5 @@
 // $Id$
 
-ACE_INLINE IOP::ServiceContextList&
-TAO_Reply_Dispatcher::reply_service_info (void)
-{
-  return this->reply_service_info_;
-}
-
 ACE_INLINE CORBA::ULong
 TAO_Synch_Reply_Dispatcher::reply_status (void) const
 {
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index 246df5d8611..d92be722a6c 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -163,8 +163,7 @@ public:
                                TAO_default_environment ()) = 0;
   // Start a Reply message.
 
-  virtual IOP::ServiceContextList &request_service_info (void) = 0;
-  virtual IOP::ServiceContextList &reply_service_info (void) = 0;
+  virtual IOP::ServiceContextList &service_info (void) = 0;
   // Accessor to the underlying ServiceContextList for request/reply
   // message.