diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-09-10 17:39:27 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-09-10 17:39:27 +0000 |
| commit | b38abb7963b33825e537315bfea3c41cf059d46b (patch) | |
| tree | 252ca181aa9f4a6ff8d8d80de5fe71b6950a7ede | |
| parent | e708db9760aaff98a520bb077f8d3335452fb8bf (diff) | |
| download | ATCD-b38abb7963b33825e537315bfea3c41cf059d46b.tar.gz | |
ChangeLogTag: Mon Sep 10 12:36:07 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | apps/Gateway/Peer/Peer.cpp | 10 |
4 files changed, 26 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 8f26575e6c9..e5548078950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 10 12:36:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Changed the condition + that checks for EWOULDBLOCK after a send. It was erroneously + written. Thanks to Nick Pratt <npratt@microstrategy.com> for + pointing this out. + Mon Sep 10 08:17:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Will not run the File_IO test in the diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8f26575e6c9..e5548078950 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Mon Sep 10 12:36:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Changed the condition + that checks for EWOULDBLOCK after a send. It was erroneously + written. Thanks to Nick Pratt <npratt@microstrategy.com> for + pointing this out. + Mon Sep 10 08:17:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Will not run the File_IO test in the diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8f26575e6c9..e5548078950 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Mon Sep 10 12:36:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Changed the condition + that checks for EWOULDBLOCK after a send. It was erroneously + written. Thanks to Nick Pratt <npratt@microstrategy.com> for + pointing this out. + Mon Sep 10 08:17:08 2001 Balachandran Natarajan <bala@cs.wustl.edu> * bin/auto_run_tests.lst: Will not run the File_IO test in the diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp index 7596a7a0a97..6f6bc8f9f4f 100644 --- a/apps/Gateway/Peer/Peer.cpp +++ b/apps/Gateway/Peer/Peer.cpp @@ -185,9 +185,7 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) ssize_t n = this->send (mb); - if (n == -1) - return -1; - else if (errno == EWOULDBLOCK) + if (n == -1 && errno == EWOULDBLOCK) { // We didn't manage to send everything, so requeue. ACE_DEBUG ((LM_DEBUG, @@ -212,8 +210,10 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) -1); return 0; } - else - return n; + else if (n == -1) + return -1; + + return n; } // Finish sending a event when flow control conditions abate. This |