Make the group id handling more consistent.

1 files changed, 6 insertions, 2 deletions

diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index 210fe72b191..e1ff0ca2c67 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -125,10 +125,14 @@ ACE_Task_Base::activate (long flags,
     return 1; // Already active.
   else
     {
-      if (this->thr_count_ > 0 && this->grp_id_ != -1)
+      if ((this->thr_count_ > 0 || grp_id == -1) && 
+            this->grp_id_ != -1)
         // If we're joining an existing group of threads then make
-        // sure to use its group id.
+        // sure to (re)use its group id.
         grp_id = this->grp_id_;
+      else if (grp_id != -1)
+        // make sure to reset the cached grp_id
+        this->grp_id_ = -1;
       this->thr_count_ += n_threads;
     }