Made changes to get rid of some compiler warnings in GIOP_Message_Acceptors.cpp and

GIOP_Message_Lite.cpp and Object_Adapter.cpp

12 files changed, 203 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index aba9adabb25..17729ca299e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Thu Jul  6 21:42:00 2000  Bruce Trask  <brucetrask@aol.com>
+      
+      * tao/GIOP_Message_Acceptors.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Acceptors::
+        process_client_request()as they are no longer used there.
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+      
+      * tao/GIOP_Message_Lite.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Lite::
+        process_client_request()as they are no longer used there.    
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+
+      * tao/Servant_Base.cpp:
+        Added an ACE_TRY_CHECK to TAO_ServantBase::synchronous_upcall_dispatch 
+        to get rid of a compiler warning.   Did the same in
+        TAO_DynamicImplementation::_dispatch function.
+      
+      * tao/Object_Adapter.cpp,.h:
+        Remove transport from the paramter list of TAO_Object_Adapter::dispatch_servant
+        as it is no longer used in the function.  
+
 Thu Jul  6 10:36:46 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/ACE.cpp: Fixed the timestamp() call so that it returns a string with
@@ -22,6 +47,42 @@ Wed Jul  5 23:36:12 2000  John Heitmann  <jwh1@cs.wustl.edu>
           Added PACE functionality to funcitons whose counterparts were
           recent additions to PACE.
 
+Wed Jul  5 20:00:00 2000  Bruce Trask  <brucetrask@aol.com>
+         
+        * tao/GIOP_Message_Acceptors.cpp:
+          Modified TAO_GIOP_Message_Acceptors::process_client_request
+          function so that it does not make the reply to the request.
+          The reply send is being moved up to allow for the later addition
+          of the asynch server.
+        
+        * tao/GIOP_Message_Acceptors.h:
+          Moved send_reply_exception into the public interface.
+        
+        * tao/GIOP_Message_Lite.cpp:
+          Made identical changes as to GIOP_Message_Acceptors::process_client_request
+          to move the reply send.
+        
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added a transport member variable to TAO_GIOP_ServerRequest class
+          and initialization of this member variable in the constructor.
+          Also removed the transport param from TAO_GIOP_ServerRequest::send_no_exception_reply
+          function as this is it no longer required to be passed in as a 
+          parameter.
+     
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added two new functions: TAO_GIOP_ServerRequest::tao_send_reply()
+          and TAO_GIOP_ServerRequest::tao_send_reply_exception.  These are the 
+          new functions that will initiate the reply send.
+
+        * tao/Servant_Base.cpp:
+          Added TAO_ServantBase::synchronous_upcall_dispatch() to do the
+          reply send.  Changed TAO_DynamicImplementation::_dispatch so
+          that it send the reply after the upcall.
+
+        * tao_idl\be\be_visitor_interface\interface_ss.cpp:
+          Added call to synchronous_upcall_dispatch which will initiate
+          the reply for synchronous calls. 
+
 Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * ace/SUN_Proactor: Added yet another handle_events() method to keep
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index aba9adabb25..17729ca299e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,28 @@
+Thu Jul  6 21:42:00 2000  Bruce Trask  <brucetrask@aol.com>
+      
+      * tao/GIOP_Message_Acceptors.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Acceptors::
+        process_client_request()as they are no longer used there.
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+      
+      * tao/GIOP_Message_Lite.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Lite::
+        process_client_request()as they are no longer used there.    
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+
+      * tao/Servant_Base.cpp:
+        Added an ACE_TRY_CHECK to TAO_ServantBase::synchronous_upcall_dispatch 
+        to get rid of a compiler warning.   Did the same in
+        TAO_DynamicImplementation::_dispatch function.
+      
+      * tao/Object_Adapter.cpp,.h:
+        Remove transport from the paramter list of TAO_Object_Adapter::dispatch_servant
+        as it is no longer used in the function.  
+
 Thu Jul  6 10:36:46 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/ACE.cpp: Fixed the timestamp() call so that it returns a string with
@@ -22,6 +47,42 @@ Wed Jul  5 23:36:12 2000  John Heitmann  <jwh1@cs.wustl.edu>
           Added PACE functionality to funcitons whose counterparts were
           recent additions to PACE.
 
+Wed Jul  5 20:00:00 2000  Bruce Trask  <brucetrask@aol.com>
+         
+        * tao/GIOP_Message_Acceptors.cpp:
+          Modified TAO_GIOP_Message_Acceptors::process_client_request
+          function so that it does not make the reply to the request.
+          The reply send is being moved up to allow for the later addition
+          of the asynch server.
+        
+        * tao/GIOP_Message_Acceptors.h:
+          Moved send_reply_exception into the public interface.
+        
+        * tao/GIOP_Message_Lite.cpp:
+          Made identical changes as to GIOP_Message_Acceptors::process_client_request
+          to move the reply send.
+        
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added a transport member variable to TAO_GIOP_ServerRequest class
+          and initialization of this member variable in the constructor.
+          Also removed the transport param from TAO_GIOP_ServerRequest::send_no_exception_reply
+          function as this is it no longer required to be passed in as a 
+          parameter.
+     
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added two new functions: TAO_GIOP_ServerRequest::tao_send_reply()
+          and TAO_GIOP_ServerRequest::tao_send_reply_exception.  These are the 
+          new functions that will initiate the reply send.
+
+        * tao/Servant_Base.cpp:
+          Added TAO_ServantBase::synchronous_upcall_dispatch() to do the
+          reply send.  Changed TAO_DynamicImplementation::_dispatch so
+          that it send the reply after the upcall.
+
+        * tao_idl\be\be_visitor_interface\interface_ss.cpp:
+          Added call to synchronous_upcall_dispatch which will initiate
+          the reply for synchronous calls. 
+
 Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * ace/SUN_Proactor: Added yet another handle_events() method to keep
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index aba9adabb25..17729ca299e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,28 @@
+Thu Jul  6 21:42:00 2000  Bruce Trask  <brucetrask@aol.com>
+      
+      * tao/GIOP_Message_Acceptors.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Acceptors::
+        process_client_request()as they are no longer used there.
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+      
+      * tao/GIOP_Message_Lite.cpp:
+        Removed   CORBA::Boolean sync_with_server and 
+        CORBA::Boolean location_forward from TAO_GIOP_Message_Lite::
+        process_client_request()as they are no longer used there.    
+        Removed transport parameter in call to 
+        orb_core->object_adapter ()->dispatch_servant(...)
+
+      * tao/Servant_Base.cpp:
+        Added an ACE_TRY_CHECK to TAO_ServantBase::synchronous_upcall_dispatch 
+        to get rid of a compiler warning.   Did the same in
+        TAO_DynamicImplementation::_dispatch function.
+      
+      * tao/Object_Adapter.cpp,.h:
+        Remove transport from the paramter list of TAO_Object_Adapter::dispatch_servant
+        as it is no longer used in the function.  
+
 Thu Jul  6 10:36:46 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/ACE.cpp: Fixed the timestamp() call so that it returns a string with
@@ -22,6 +47,42 @@ Wed Jul  5 23:36:12 2000  John Heitmann  <jwh1@cs.wustl.edu>
           Added PACE functionality to funcitons whose counterparts were
           recent additions to PACE.
 
+Wed Jul  5 20:00:00 2000  Bruce Trask  <brucetrask@aol.com>
+         
+        * tao/GIOP_Message_Acceptors.cpp:
+          Modified TAO_GIOP_Message_Acceptors::process_client_request
+          function so that it does not make the reply to the request.
+          The reply send is being moved up to allow for the later addition
+          of the asynch server.
+        
+        * tao/GIOP_Message_Acceptors.h:
+          Moved send_reply_exception into the public interface.
+        
+        * tao/GIOP_Message_Lite.cpp:
+          Made identical changes as to GIOP_Message_Acceptors::process_client_request
+          to move the reply send.
+        
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added a transport member variable to TAO_GIOP_ServerRequest class
+          and initialization of this member variable in the constructor.
+          Also removed the transport param from TAO_GIOP_ServerRequest::send_no_exception_reply
+          function as this is it no longer required to be passed in as a 
+          parameter.
+     
+        * tao/GIOP_Server_Request.cpp,.h:
+          Added two new functions: TAO_GIOP_ServerRequest::tao_send_reply()
+          and TAO_GIOP_ServerRequest::tao_send_reply_exception.  These are the 
+          new functions that will initiate the reply send.
+
+        * tao/Servant_Base.cpp:
+          Added TAO_ServantBase::synchronous_upcall_dispatch() to do the
+          reply send.  Changed TAO_DynamicImplementation::_dispatch so
+          that it send the reply after the upcall.
+
+        * tao_idl\be\be_visitor_interface\interface_ss.cpp:
+          Added call to synchronous_upcall_dispatch which will initiate
+          the reply for synchronous calls. 
+
 Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
         * ace/SUN_Proactor: Added yet another handle_events() method to keep
diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp
index bc4b2562634..629ae1e03ca 100644
--- a/TAO/tao/GIOP_Message_Acceptors.cpp
+++ b/TAO/tao/GIOP_Message_Acceptors.cpp
@@ -89,7 +89,7 @@ TAO_GIOP_Message_Acceptors::
   TAO_GIOP_ServerRequest request (this,
                                   input,
                                   *this->output_,
-								  transport, //BRT
+                                  transport,
                                   orb_core,
                                   version);
 
@@ -97,8 +97,7 @@ TAO_GIOP_Message_Acceptors::
 
   CORBA::ULong request_id = 0;
   CORBA::Boolean response_required = 0;
-  CORBA::Boolean sync_with_server = 0;
-  CORBA::Boolean location_forward = 0;
+
   int parse_error = 0;
 
   ACE_TRY
@@ -113,7 +112,6 @@ TAO_GIOP_Message_Acceptors::
       request_id = request.request_id ();
 
       response_required = request.response_expected ();
-      sync_with_server = request.sync_with_server ();
 
 #if (TAO_NO_IOR_TABLE == 0)
       const CORBA::Octet *object_key =
@@ -171,7 +169,6 @@ TAO_GIOP_Message_Acceptors::
       orb_core->object_adapter ()->dispatch_servant (
                                                      request.object_key (),
                                                      request,
-                                                     transport,
                                                      0,
                                                      ACE_TRY_ENV
                                                      );
@@ -198,9 +195,6 @@ TAO_GIOP_Message_Acceptors::
 
       *this->output_ << object_ptr;
 
-      // Flag for code below catch blocks.
-      location_forward = 1;
-//BRT 
       int result = this->send_message (transport,
                                    *this->output_);
 
@@ -311,28 +305,6 @@ TAO_GIOP_Message_Acceptors::
 
   int result = 0;
 
-  // Do we have a twoway request, a oneway SYNC_WITH_TARGET,
-  // or a oneway SYNC_WITH_SERVER with a location forward reply?
-//BRT
-//  if ((response_required && !sync_with_server)
-//      || (sync_with_server && location_forward))
-//    {
-//      result = this->send_message (transport,
-//                                   *this->output_);
-//
-//      if (result == -1)
-//        {
-//          if (TAO_debug_level > 0)
-//            {
-//              // No exception but some kind of error, yet a response
-//              // is required.
-//              ACE_ERROR ((LM_ERROR,
-//                          ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
-//                          ACE_TEXT ("TAO_GIOP::process_server_message")));
-//            }
-//        }
-//    }
-
   return result;
 }
 
@@ -447,7 +419,6 @@ TAO_GIOP_Message_Acceptors::
       orb_core->object_adapter ()->dispatch_servant
         (server_request.object_key (),
          server_request,
-         transport,
          0,
          ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tao/GIOP_Message_Acceptors.h b/TAO/tao/GIOP_Message_Acceptors.h
index 8a8a74b3d26..d579f91966b 100644
--- a/TAO/tao/GIOP_Message_Acceptors.h
+++ b/TAO/tao/GIOP_Message_Acceptors.h
@@ -67,7 +67,6 @@ public:
   // sensitive. Only the common stuff for all the replies to be
   // sent would be handled.
 
-//BRT
     int send_reply_exception (TAO_Transport *transport,
                             TAO_ORB_Core* orb_core,
                             CORBA::ULong request_id,
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 838d53cf58c..a761c58a2b6 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -569,7 +569,7 @@ TAO_GIOP_Message_Lite::
   TAO_GIOP_ServerRequest request (this,
                                   input,
                                   *this->output_,
-								  transport,//BRT
+                                  transport,
                                   orb_core,
                                   version);
 
@@ -577,8 +577,7 @@ TAO_GIOP_Message_Lite::
 
   CORBA::ULong request_id = 0;
   CORBA::Boolean response_required = 0;
-  CORBA::Boolean sync_with_server = 0;
-  CORBA::Boolean location_forward = 0;
+
   int parse_error = 0;
 
   ACE_TRY
@@ -593,7 +592,6 @@ TAO_GIOP_Message_Lite::
       request_id = request.request_id ();
 
       response_required = request.response_expected ();
-      sync_with_server = request.sync_with_server ();
 
 #if (TAO_NO_IOR_TABLE == 0)
       const CORBA::Octet *object_key =
@@ -650,7 +648,6 @@ TAO_GIOP_Message_Lite::
       orb_core->object_adapter ()->dispatch_servant (
                                                      request.object_key (),
                                                      request,
-                                                     transport,
                                                      0,
                                                      ACE_TRY_ENV
                                                      );
@@ -676,10 +673,6 @@ TAO_GIOP_Message_Lite::
 
       *this->output_ << object_ptr;
 
-      // Flag for code below catch blocks.
-      location_forward = 1;
-
-// BRT CHANGE
       int result = this->send_message (transport,
                                    *this->output_);
 
@@ -789,28 +782,6 @@ TAO_GIOP_Message_Lite::
 
   int result = 0;
 
-  // Do we have a twoway request, a oneway SYNC_WITH_TARGET,
-  // or a oneway SYNC_WITH_SERVER with a location forward reply?
-//BRT
-//  if ((response_required && !sync_with_server)
-//      || (sync_with_server && location_forward))
-//    {
-//      result = this->send_message (transport,
-//                                   *this->output_);
-//
-//      if (result == -1)
-//        {
-//          if (TAO_debug_level > 0)
-//           {
-//              // No exception but some kind of error, yet a response
-//              // is required.
-//              ACE_ERROR ((LM_ERROR,
-//                          ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
-//                          ACE_TEXT ("TAO_GIOP::process_server_message")));
-//            }
-//        }
-//    }
-
   return result;
 
 }
@@ -927,7 +898,6 @@ TAO_GIOP_Message_Lite::
       orb_core->object_adapter ()->dispatch_servant
         (server_request.object_key (),
          server_request,
-         transport,
          0,
          ACE_TRY_ENV);
 
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index c911cfd7b63..2014cbf5e1d 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -4,7 +4,6 @@
 
 #include "tao/GIOP_Server_Request.h"
 
-//BRT CHANGE
 #include "tao/GIOP_Message_Acceptors.h"
 
 #include "tao/CDR.h"
@@ -52,13 +51,13 @@ TAO_GIOP_ServerRequest::
     TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
                             TAO_InputCDR &input,
                             TAO_OutputCDR &output,
-                            TAO_Transport *transport,//BRT
+                            TAO_Transport *transport,
                             TAO_ORB_Core *orb_core,
                             const TAO_GIOP_Version & /*version*/)
       :mesg_base_ (mesg_base),
        incoming_ (&input),
        outgoing_ (&output),
-	   transport_(transport),// BRT CHANGE
+       transport_(transport),
        response_expected_ (0),
        sync_with_server_ (0),
        lazy_evaluation_ (0),
@@ -381,8 +380,8 @@ TAO_GIOP_ServerRequest::exception_type (void)
   return this->exception_type_;
 }
 
-void											//BRT
-TAO_GIOP_ServerRequest::send_no_exception_reply (/*TAO_Transport *transport*/)
+void										
+TAO_GIOP_ServerRequest::send_no_exception_reply ()
 {
   // Construct our reply generator
   TAO_Pluggable_Reply_Params reply_params;
@@ -408,7 +407,7 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (/*TAO_Transport *transport*/)
                                         reply_params);
 
   // Send the message
-  int result = this->mesg_base_->send_message (transport_,//BRT
+  int result = this->mesg_base_->send_message (transport_,
                                                *this->outgoing_);
 
   if (result == -1)
@@ -424,7 +423,7 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (/*TAO_Transport *transport*/)
     }
 }
 
-// BRT CHANGE
+
 void 
 TAO_GIOP_ServerRequest::tao_send_reply()
 {
@@ -446,7 +445,6 @@ TAO_GIOP_ServerRequest::tao_send_reply()
     }
 }
 
-//BRT CHANGE
 void 
 TAO_GIOP_ServerRequest::tao_send_reply_exception(CORBA::Exception& ex)
 {
@@ -456,7 +454,7 @@ TAO_GIOP_ServerRequest::tao_send_reply_exception(CORBA::Exception& ex)
     result = ACE_static_cast(TAO_GIOP_Message_Acceptors*,mesg_base_)->send_reply_exception (transport_,
                                                orb_core_,
                                                request_id_,
-											   &service_info(),//BRT
+                                               &service_info(),
                                                &ex);
     if (result == -1)
     {
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index 1078168b967..23a6dd4346e 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -48,7 +48,7 @@ public:
   TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
                           TAO_InputCDR &input,
                           TAO_OutputCDR &output,
-						  TAO_Transport *transport, //BRT CHANGE
+                          TAO_Transport *transport,
                           TAO_ORB_Core *orb_core,
                           const TAO_GIOP_Version &version);
 
@@ -141,8 +141,8 @@ public:
 
   virtual void _tao_lazy_evaluation (int lazy_evaluation);
   // Set the lazy evaluation flag
-										//BRT
-  virtual void send_no_exception_reply (/*TAO_Transport *transport*/);
+									
+  virtual void send_no_exception_reply ();
   // Used with reliable oneway requests.
 
   virtual CORBA::Principal_ptr principal (void) const;
@@ -179,9 +179,9 @@ public:
   TAO_Tagged_Profile &profile (void);
   // Return the reference to the tagged profile
 
-  virtual void tao_send_reply (void); // BRT CHANGE
+  virtual void tao_send_reply (void);
 
-  virtual void tao_send_reply_exception (CORBA::Exception&); //BRT CHANGE
+  virtual void tao_send_reply_exception (CORBA::Exception&);
 
 
 private:
@@ -199,7 +199,6 @@ private:
   // Outgoing stream.
 
   TAO_Transport *transport_;
-  //BRT CHANGE
 
   CORBA::Boolean response_expected_;
   // 0: oneway (SYNC_NONE or SYNC_WITH_TRANSPORT)
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
index 14e7cdd2bbb..a0c56b0b91b 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -245,7 +245,6 @@ TAO_Object_Adapter::deactivate_i (CORBA::Boolean wait_for_completion,
 void
 TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
                                       CORBA::ServerRequest &req,
-                                      TAO_Transport *transport,
                                       void *context,
                                       CORBA::Environment &ACE_TRY_ENV)
 {
@@ -277,11 +276,6 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
   ACE_CHECK;
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
-//BRT
-//  if (req.sync_with_server ())
-//    {
-//      req.send_no_exception_reply (transport);
-//    }
 
   // Servant dispatch.
   {
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index 4ab842cd3d7..a7274abcdd3 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/Servant_Base.cpp
@@ -193,7 +193,6 @@ TAO_ServantBase::_decrement_single_threaded_poa_lock_count (void)
     }
 }
 
-//BRT CHANGE
 void TAO_ServantBase::synchronous_upcall_dispatch(CORBA::ServerRequest &req,
                                                   void *context,
                                                   void *derived_this,
@@ -230,6 +229,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch(CORBA::ServerRequest &req,
     if ((!req.sync_with_server() && req.response_expected()))
     {
       req.tao_send_reply();
+	  ACE_TRY_CHECK;
     }
   }
   ACE_CATCH(CORBA::Exception,ex)
@@ -484,12 +484,13 @@ TAO_DynamicImplementation::_dispatch (CORBA::ServerRequest &request,
       request.dsi_marshal (ACE_TRY_ENV);
       ACE_CHECK;
     }
-//BRT
+
    ACE_TRY
    {
      if ((!request.sync_with_server() && request.response_expected()))
      {
        request.tao_send_reply();
+	   ACE_TRY_CHECK;
      }
    }
    ACE_CATCH(CORBA::Exception,ex)
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index d04c1bbec9d..80c4e7da949 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -84,7 +84,6 @@ protected:
   // results and out parameters (if any) or the exceptions thrown into
   // <request>.
 
-    //BRT CHANGE
   virtual void synchronous_upcall_dispatch (CORBA::ServerRequest &req,
                                             void *context,
                                             void *derived_this,
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index bf0cf400b87..c33fdad3b27 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -173,15 +173,13 @@ public:
   virtual void _tao_lazy_evaluation (int lazy_evaluation) = 0;
   // Set the lazy evaluation flag
 
-  //BRT
   virtual void send_no_exception_reply (/*TAO_Transport *transport*/) = 0;
   // Used with reliable oneway requests.
 
   virtual void tao_send_reply (void) = 0;
-  // BRT CHANGE
 
   virtual void tao_send_reply_exception (CORBA::Exception&) = 0;
-  //BRT CHANGE
+
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA::ServerRequest_ptr _ptr_type;