diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-12-07 16:41:34 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-12-07 16:41:34 +0000 |
| commit | 7d14f4929bf1e6f92bb8b59c6229d6edb2123b75 (patch) | |
| tree | b5ec48ae098b2d162899c1ea4508321531b15020 | |
| parent | b7da9906aa72edec01f561aa06a849df149af6d2 (diff) | |
| download | ATCD-7d14f4929bf1e6f92bb8b59c6229d6edb2123b75.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/Connection_Handler.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 1 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 4 |
4 files changed, 13 insertions, 9 deletions
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index bb6ac1521b2..3d42ba951f8 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -23,11 +23,14 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) int TAO_Connection_Handler::purge_entry (void) { - // Decerment our reference count before we remove ourselves from the - // map as our references are not held by the map - this->decr_ref_count (); - return + int retval = this->orb_core_->connection_cache ().purge_entry (this->cache_map_entry_); + + // Decrement our reference count as we have been removed from the + // cache map. + this->decr_ref_count (); + + return retval; } int diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 329d82f786d..17f0ec30437 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -474,9 +474,9 @@ TAO_GIOP_Message_Base::generate_exception_reply ( ACE_TRY { - // Make the GIOP & reply header. They are version specific. - this->generator_parser_->write_reply_header (cdr, - params); + // Make the GIOP & reply header. + this->generate_reply_header (cdr, + params); x._tao_encode (cdr, ACE_TRY_ENV); ACE_TRY_CHECK; } diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 2c48be4d602..cae944ed72d 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -95,6 +95,7 @@ PLUGGABLE_MESSAGING_FILES = \ Pluggable_Messaging \ Pluggable_Messaging_Utils \ GIOP_Message_Base \ + GIOP_Message_Lite \ GIOP_Message_Generator_Parser \ GIOP_Message_Generator_Parser_10 \ GIOP_Message_Generator_Parser_11 \ diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 67223876261..31ca250954b 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -69,7 +69,7 @@ TAO_ServantBase::_default_POA (CORBA::Environment &ACE_TRY_ENV) TAO_ORB_Core_instance ()->root_poa (ACE_TRY_ENV); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); - return PortableServer::POA::_narrow (object.in (), + return PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); } @@ -121,7 +121,7 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV) CORBA::ORB_ptr servant_orb = 0; - if (poa_current_impl != 0 + if (poa_current_impl != 0 && this == poa_current_impl->servant ()) { servant_orb = poa_current_impl->orb_core ().orb () ; |