From e808b29aaac820869d63e3827a1c06333e463d90 Mon Sep 17 00:00:00 2001 From: schmidt Date: Sat, 30 Jun 2001 17:52:26 +0000 Subject: ChangeLogTag:Sat Jun 30 12:44:11 2001 Douglas C. Schmidt --- ChangeLog | 6 ++++++ ChangeLogs/ChangeLog-02a | 6 ++++++ ChangeLogs/ChangeLog-03a | 6 ++++++ ace/FIFO_Send_Msg.cpp | 11 +++++++---- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 107e5b60f8e..b2270a94e25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 30 12:44:11 2001 Douglas C. Schmidt + + * ace/FIFO_Send_Msg.cpp (send): Fixed another errant use of + putmsg(). Thanks to David Trusty + for reporting this. + Fri Jun 29 22:31:56 2001 Balachandran Natarajan * Reverted the changes in this entry. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 107e5b60f8e..b2270a94e25 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sat Jun 30 12:44:11 2001 Douglas C. Schmidt + + * ace/FIFO_Send_Msg.cpp (send): Fixed another errant use of + putmsg(). Thanks to David Trusty + for reporting this. + Fri Jun 29 22:31:56 2001 Balachandran Natarajan * Reverted the changes in this entry. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 107e5b60f8e..b2270a94e25 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sat Jun 30 12:44:11 2001 Douglas C. Schmidt + + * ace/FIFO_Send_Msg.cpp (send): Fixed another errant use of + putmsg(). Thanks to David Trusty + for reporting this. + Fri Jun 29 22:31:56 2001 Balachandran Natarajan * Reverted the changes in this entry. diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index 844ce5e5cd9..8d947252002 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -24,10 +24,13 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg) { // ACE_TRACE ("ACE_FIFO_Send_Msg::send"); #if defined (ACE_HAS_STREAM_PIPES) - return ACE_OS::putmsg (this->get_handle (), - (strbuf *) 0, - (strbuf *) &send_msg, - 0); + if (ACE_OS::putmsg (this->get_handle (), + (strbuf *) 0, + (strbuf *) &send_msg, + 0) == -1) + return -1; + else + return send_msg.len; #else iovec iov[2]; -- cgit v1.2.1