ChangeLogTag:Wed Jul 30 12:50:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

1 files changed, 0 insertions, 40 deletions

diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index c1b02827c15..6ed972572d8 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -216,16 +216,6 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   ACE_TRY
     {
-      // @@ Do we really need the following "callback?"  The
-      //    STANDARD receive_request_service_contexts() interception
-      //    point appears to be placed at around the same point in the
-      //    upcall, i.e. just before the upcall is dispatched.  It is
-      //    slightly earlier than this callback function().  It also
-      //    potentially provides more information than is available in
-      //    this callback.
-      //        -Ossama
-      req.orb_core ()->services_log_msg_pre_upcall (req);
-
       // Invoke the skeleton, it will demarshal the arguments,
       // invoke the right operation on the skeleton class
       // (<derived_this>), and marshal any results.
@@ -238,16 +228,6 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
 
-      // @@ Same here...
-      //    Do we really need the following "callback?"  The
-      //    STANDARD send_reply()/send_other()/send_exception
-      //    interception points appear to do the same thing.  They
-      //    even provide more information than is available in this
-      //    callback.
-      //        -Ossama
-      // Log the message state to FT_Service Logging facility
-      req.orb_core ()->services_log_msg_post_upcall (req);
-
       // We send the reply only if it is NOT a SYNC_WITH_SERVER, a
       // response is expected and if the reply is not deferred.
       if (send_reply)
@@ -298,16 +278,6 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   ACE_TRY
     {
-      // @@ Do we really need the following "callback?"  The
-      //    STANDARD receive_request_service_contexts() interception
-      //    point appears to be placed at around the same point in the
-      //    upcall, i.e. just before the upcall is dispatched.  It is
-      //    slightly earlier than this callback function().  It also
-      //    potentially provides more information than is available in
-      //    this callback.
-      //        -Ossama
-      req.orb_core ()->services_log_msg_pre_upcall (req);
-
       // Invoke the skeleton, it will demarshal the arguments,
       // invoke the right operation on the skeleton class
       // (<derived_this>), and marshal any results.
@@ -320,16 +290,6 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
 
-      // @@ Same here...
-      //    Do we really need the following "callback?"  The
-      //    STANDARD send_reply()/send_other()/send_exception
-      //    interception points appear to do the same thing.  They
-      //    even provide more information than is available in this
-      //    callback.
-      //        -Ossama
-      // Log the message state to FT_Service Logging facility
-      req.orb_core ()->services_log_msg_post_upcall (req);
-
       // Return immediately. Do not send a reply; this is an
       // asunchronous upcall. (unless, of course there is a system
       // exception.