*** empty log message ***

7 files changed, 32 insertions, 7 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index ed276bc4f2a..8c3168afd6d 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,24 @@
+Sat Mar 14 00:13:22 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/Task.h (ACE_Task_Base): Give a default value of 0 for the
+ 	  Thread Manager so we can use this as a base class.
+
+	* tests/Future_Test.cpp: Since the Scheduler provides its own
+ 	  activation queue it doesn't make sense to inherit from ACE_Task
+ 	  (which provides its own queue) but instead ACE_Task_Base
+	  (which doesn't define its own queue).  Thanks to Loren Rittle
+ 	  <rittle@comm.mot.com> for reporting this.
+
+	* examples/Threads/future[12].cpp: Since the Scheduler provides
+ 	  its own activation queue it doesn't make sense to inherit from
+ 	  ACE_Task (which provides its own queue) but instead
+ 	  ACE_Task_Base (which doesn't define its own queue).  Thanks to
+ 	  Loren Rittle <rittle@comm.mot.com> for reporting this.
+
+	* examples/Threads/future[12].cpp: Removed the explicit call to
+ 	  scheduler_->close() to avoid closing the scheduler down twice.
+  	  Thanks to Loren Rittle <rittle@comm.mot.com> for reporting this.
+
 Fri Mar 13 23:41:44 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/Process.cpp (ACE_Process_Options): Moved column out of
diff --git a/README b/README
index c98766b3ece..90d344f66d9 100644
--- a/README
+++ b/README
@@ -522,6 +522,7 @@ J. Russell Noseworthy <rnosewor@objectsciences.com>
 Carol Sanders <csanders@mdc.com>
 Jerry Bickle <glbick@most.fw.hac.com>
 Paul von Behren <Paul_von_Behren@stortek.com>
+Loren Rittle <rittle@comm.mot.com> 
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
diff --git a/ace/Task.cpp b/ace/Task.cpp
index e7ea90312f7..81155c17456 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -27,7 +27,8 @@ ACE_Task_Base::wait (void)
 {
   ACE_TRACE ("ACE_Task_Base::wait");
 
-  // If we don't have a thread manager, we probably were never activated
+  // If we don't have a thread manager, we probably were never
+  // activated.
   if (this->thr_mgr () != 0)
     return this->thr_mgr ()->wait_task (this);
   else
diff --git a/ace/Task.h b/ace/Task.h
index fa538f35746..d116250a5c4 100644
--- a/ace/Task.h
+++ b/ace/Task.h
@@ -54,7 +54,7 @@ class ACE_Export ACE_Task_Base : public ACE_Service_Object
   //    polymorphically.
 public:
   // = Initialization and termination methods.
-  ACE_Task_Base (ACE_Thread_Manager *);
+  ACE_Task_Base (ACE_Thread_Manager * = 0);
   // Constructor.
 
   virtual ~ACE_Task_Base (void);
diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp
index 02441c44ca3..1f63bd14246 100644
--- a/examples/Threads/future1.cpp
+++ b/examples/Threads/future1.cpp
@@ -45,7 +45,7 @@ static ATOMIC_INT capsule_no (0);
 static ATOMIC_INT methodobject_count (0);
 static ATOMIC_INT methodobject_no (0);
 
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
+class Scheduler : public ACE_Task_Base
   // = TITLE
   //     Active Object Scheduler.
 {
@@ -154,10 +154,11 @@ class Method_Object_end : public ACE_Method_Object
 public:
   Method_Object_end (Scheduler *new_scheduler): scheduler_ (new_scheduler) {}
   virtual ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
+  virtual int call (void) { return -1; }
 
 private:
   Scheduler *scheduler_;
+  // Keep track of our scheduler.
 };
 
 // Constructor.
diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp
index d6252700944..708ec6c5d03 100644
--- a/examples/Threads/future2.cpp
+++ b/examples/Threads/future2.cpp
@@ -45,7 +45,7 @@ static ATOMIC_INT scheduler_open_count (0);
 class Method_Object_work;
 class Method_Object_name;
 
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
+class Scheduler : public ACE_Task_Base
   // = TITLE
   //     Active Object Scheduler.
 {
@@ -164,10 +164,11 @@ class Method_Object_end : public ACE_Method_Object
 public:
   Method_Object_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
   virtual ~Method_Object_end (void) {}
-  virtual int call (void) { this->scheduler_->close (); return -1; }
+  virtual int call (void) { return -1; }
 
 private:
   Scheduler *scheduler_;
+  // Keep track of our scheduler.
 };
 
 // constructor
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 945daaf4ca4..978fbd875e9 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -43,7 +43,7 @@ static ATOMIC_INT capsule_count (0);
 // a counter for the method objects...
 static ATOMIC_INT methodobject_count (0);
 
-class Scheduler : public ACE_Task<ACE_MT_SYNCH>
+class Scheduler : public ACE_Task_Base
   // = TITLE
   //     Active Object Scheduler.
 {