diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-03 21:51:42 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-02-03 21:51:42 +0000 |
| commit | 079e61bf84a2d19d35023f6942291b132e6260c7 (patch) | |
| tree | 2fcbcd8d8e64104ac9924ec5056179a0c6ee7c4a | |
| parent | f55d95dbfa2e41fff4518c71f75707c4eeb8e384 (diff) | |
| download | ATCD-079e61bf84a2d19d35023f6942291b132e6260c7.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/SHMIOP_Acceptor.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/SHMIOP_Connect.cpp | 5 | ||||
| -rw-r--r-- | ace/MEM_Addr.i | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/TAO/tao/SHMIOP_Acceptor.cpp b/TAO/tao/SHMIOP_Acceptor.cpp index 43197bb552a..2faf5b9c382 100644 --- a/TAO/tao/SHMIOP_Acceptor.cpp +++ b/TAO/tao/SHMIOP_Acceptor.cpp @@ -147,9 +147,6 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (this->parse_options (options) == -1) return -1; - this->base_acceptor_.acceptor().malloc_options ().minimum_bytes_ - = this->mmap_size_; - if (port) this->address_.set (port); @@ -205,6 +202,9 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core) return -1; } + this->base_acceptor_.acceptor().malloc_options ().minimum_bytes_ + = this->mmap_size_; + // @@ Should this be a catastrophic error??? if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0) { diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp index 8b1e0d4ffa0..4a1f4d9773e 100644 --- a/TAO/tao/SHMIOP_Connect.cpp +++ b/TAO/tao/SHMIOP_Connect.cpp @@ -196,7 +196,10 @@ TAO_SHMIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle, --this->refcount_; if (this->refcount_ == 0) - return TAO_SVC_HANDLER::handle_close (handle, rm); + { + this->peer().remove (); + return TAO_SVC_HANDLER::handle_close (handle, rm); + } return 0; } diff --git a/ace/MEM_Addr.i b/ace/MEM_Addr.i index 23fc93b385d..6da9b564988 100644 --- a/ace/MEM_Addr.i +++ b/ace/MEM_Addr.i @@ -26,7 +26,7 @@ ACE_MEM_Addr::set (const ASYS_TCHAR port_number[]) // Set the port number. -void +ACE_INLINE void ACE_MEM_Addr::set_port_number (u_short port_number, int encode) { @@ -86,7 +86,7 @@ ACE_MEM_Addr::operator == (const ACE_MEM_Addr &sap) const this->internal_ == sap.internal_; } -int +ACE_INLINE int ACE_MEM_Addr::operator == (const ACE_INET_Addr &sap) const { ACE_TRACE ("ACE_MEM_Addr::operator =="); @@ -96,14 +96,14 @@ ACE_MEM_Addr::operator == (const ACE_INET_Addr &sap) const // Compare two addresses for inequality. -int +ACE_INLINE int ACE_MEM_Addr::operator != (const ACE_MEM_Addr &sap) const { ACE_TRACE ("ACE_MEM_Addr::operator !="); return !((*this) == sap); } -int +ACE_INLINE int ACE_MEM_Addr::operator != (const ACE_INET_Addr &sap) const { ACE_TRACE ("ACE_MEM_Addr::operator !="); |