summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2002-09-22 14:25:37 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2002-09-22 14:25:37 +0000
commit8cd6102346a371eb88d1f54a81260289bfd801a6 (patch)
treebee3733fbf58b72a110069622957e2022f443cdb
parent81a334a5abb739f63128aaa75ebc1d5d0080b102 (diff)
downloadATCD-8cd6102346a371eb88d1f54a81260289bfd801a6.tar.gz
ChangeLogTag:Sun Sep 22 08:49:41 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--ace/Svc_Handler.cpp3
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dad2f5b352..b7a3c1d8d95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 22 08:49:41 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * ace/Svc_Handler.cpp (flush_i): Don't flush the queued messages
+ if the connection fails. Thanks to Andrew Finnell
+ <andrew@activesol.net> for this fix.
+
Sat Sep 21 23:05:56 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* bin/subst_env.pl: Improved conversion to different coding
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5dad2f5b352..b7a3c1d8d95 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sun Sep 22 08:49:41 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * ace/Svc_Handler.cpp (flush_i): Don't flush the queued messages
+ if the connection fails. Thanks to Andrew Finnell
+ <andrew@activesol.net> for this fix.
+
Sat Sep 21 23:05:56 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* bin/subst_env.pl: Improved conversion to different coding
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index d844a5d2d27..07003ca4066 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -465,7 +465,8 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void)
result = this->peer ().send_n (mblk);
// This method assumes the caller holds the queue's lock!
- this->msg_queue ()->flush_i ();
+ if (result != -1)
+ this->msg_queue ()->flush_i ();
if (this->timeoutp_ != 0)
// Update the next timeout period by adding the interval.