summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog9
-rw-r--r--ACE/THANKS1
-rw-r--r--ACE/ace/Dev_Poll_Reactor.cpp2
3 files changed, 11 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0beb3994c72..3df69239343 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Tue Apr 10 20:09:23 UTC 2012 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ace/Dev_Poll_Reactor.cpp (ACE_Dev_Poll_Reactor::resumable_handler):
+ Changed this method to return 1 instead of 0. Thanks to David
+ Simmonds <david dot simmonds at iggroup dot com> for providing
+ this fix. This fixes bugid 4015.
+
+ Added David to the ACE hall of fame.
+
Tue Apr 10 20:10:06 UTC 2012 Adam Mitz <mitza@ociweb.com>
* bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/ACE/THANKS b/ACE/THANKS
index ac8398f7909..40e43664c07 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2362,6 +2362,7 @@ Andrey Karpov <karpov at viva64 dot com>
Dmytro Ovdiienko <dmitriy dot ovdienko at gmail.com>
Andrea Sormanni <andrea dot sormanni at gmail dot com>
Thomas Stegemann <Thomas dot Stegemann at materna dot de>
+David Simmonds <david dot simmonds at iggroup dot com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index a2204639662..e417602bf3c 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -1933,7 +1933,7 @@ ACE_Dev_Poll_Reactor::resumable_handler (void)
{
// @@ Is this correct?
- return 0;
+ return 1;
}
bool