summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>2005-08-25 16:42:40 +0000
committerChris Cleeland <chris.cleeland@gmail.com>2005-08-25 16:42:40 +0000
commit73cd7d85183cac3560578ba9a5525ba38c65f004 (patch)
tree8b0cde240089aa3689f945eca557c5eaf79b3244
parent9e627a3546268e8c98501eca869dff7f6c0f3d15 (diff)
downloadATCD-73cd7d85183cac3560578ba9a5525ba38c65f004.tar.gz
Thu Aug 25 11:40:36 2005 Chris Cleeland <cleeland_c@ociweb.com>
Correct grp_id/grp_id_ mismatch in ACE_Task_Base::activate().
-rw-r--r--ChangeLog19
-rw-r--r--ace/Task.cpp2
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 264c23de04e..5e84749e4c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 25 11:40:36 2005 Chris Cleeland <cleeland_c@ociweb.com>
+
+ * ace/Task.cpp (activate): Corrected misuse of the argument
+ 'grp_id' rather than the data member 'grp_id_'. This prevented
+ activate() from being able to join existing group. Thanks to
+ Kevin Heifner <heifner_k at ociweb dot com> for catching this.
+
Thu Aug 25 12:32:18 2005 Steve Huston <shuston@riverace.com>
* tests/Process_Manual_Event_Test.cpp: Removed #if0 block put in
@@ -5,17 +12,17 @@ Thu Aug 25 12:32:18 2005 Steve Huston <shuston@riverace.com>
Wed Aug 24 19:09:31 2005 Steve Huston <shuston@riverace.com>
- * configure.ac: Copied in updated copyright paragraph from COPYING.
+ * configure.ac: Copied in updated copyright paragraph from COPYING.
- * ace/OS_NS_Thread.cpp: Formatting fixes.
+ * ace/OS_NS_Thread.cpp: Formatting fixes.
- * tests/Process_Manual_Event_Test.cpp: ACE_ERROR formatting
- corrections (%p needs a string); code format fixes.
+ * tests/Process_Manual_Event_Test.cpp: ACE_ERROR formatting
+ corrections (%p needs a string); code format fixes.
Wed Aug 24 17:15:28 2005 Steve Huston <shuston@riverace.com>
- * ace/Stream_Modules.h: Added some info about ACE_Stream_Head so
- I don't have to keep looking it up ;-)
+ * ace/Stream_Modules.h: Added some info about ACE_Stream_Head so
+ I don't have to keep looking it up ;-)
Wed Aug 24 12:39:04 2005 Chad Elliott <elliott_c@ociweb.com>
diff --git a/ace/Task.cpp b/ace/Task.cpp
index b2bacc0eaf2..293bbb187f0 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -134,7 +134,7 @@ ACE_Task_Base::activate (long flags,
return 1; // Already active.
else
{
- if (this->thr_count_ > 0 && grp_id != -1)
+ if (this->thr_count_ > 0 && this->grp_id_ != -1)
// If we're joining an existing group of threads then make
// sure to use its group id.
grp_id = this->grp_id_;