diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-18 23:56:16 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-18 23:56:16 +0000 |
| commit | c6901d75b2d9195552b0e99d94d43200026ef923 (patch) | |
| tree | 838b8ba5ba5bfa77241c773411a45c9b3bad751a | |
| parent | 32aadac28e193e8817430518fc20f7b08833a074 (diff) | |
| download | ATCD-c6901d75b2d9195552b0e99d94d43200026ef923.tar.gz | |
ChangeLogTag: Mon Nov 18 17:54:41 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/tao/Transport.cpp | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dc3a3748132..02b3e160dbc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,7 @@ +Mon Nov 18 17:54:41 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/Transport.cpp: Cosmetic changes. + Mon Nov 18 14:50:31 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> * TAO_IDL/be_include/be_global.h: diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 693156816bf..24dc9e08246 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -698,9 +698,10 @@ TAO_Transport::close_connection_shared (int purge, int retval = 0; - // The famous hack for 1020. We drive the Leader_Follower for - // a short period. - if (this->ws_->is_registered ()) + // NOTE: If the wait strategy is in blocking mode, then there is no + // chance that it could be inside the reactor. We can safely skip + // driving the LF. + if (this->ws_->non_blocking ()) { // NOTE: This is a work around for BUG 1020. We drive the leader // follower for a predetermined amount of time. Ideally this @@ -712,11 +713,12 @@ TAO_Transport::close_connection_shared (int purge, this->orb_core_->leader_follower ().wait_for_event (eh, this, &tv); + } // We need to explicitly shut it down to avoid memory leaks. if (retval == -1 || - !this->ws_->is_registered ()) + !this->ws_->non_blocking ()) { eh->close_connection (); } |