diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-29 15:10:03 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-29 15:10:03 +0000 |
| commit | 821adfe635d49d273d2124accf1cc7e3207a79a4 (patch) | |
| tree | 61e0d6c9a44847bdf3b0a07852381bbf2ccc6f49 | |
| parent | f98ef6a49902e22a51bdac7c83b34ab4e8c88ba1 (diff) | |
| download | ATCD-821adfe635d49d273d2124accf1cc7e3207a79a4.tar.gz | |
ChangeLogTag: Mon Jun 29 15:08:12 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Connection_Handler.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b27c8dc3ce8..b6145a2bbbb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 29 15:08:12 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * tao/Connection_Handler.cpp: + + Fixed a bug in Friday's commit. + Sun Jun 28 16:15:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tests/IDL_Test/union.idl diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 7945e538cda..7bf44e6aa9e 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -208,8 +208,10 @@ TAO_Connection_Handler::handle_output_eh ( // The default constraints are to never block. TAO::Transport::Drain_Constraints dc; - return_value = - (this->transport ()->handle_output (dc) == TAO_Transport::DR_OK) ? 0 : -1; + if (this->transport ()->handle_output (dc) == TAO_Transport::DR_ERROR) + { + return_value = -1; + } this->pos_io_hook (return_value); |