ChangeLogTag:Thu Feb 14 08:17:40 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

8 files changed, 40 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index ba5277be77f..5e291466cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 14 08:17:40 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Strategies_T.h:
+	* ace/Strategies_T.i: Allow the reactor of the Svc Handler to be
+	  set to the reactor passed to the Creation Strategy.  Thanks to
+ 	  David Smith <smithdav@tycoelectronics.com> for motivating this.
+
 Thu Feb 14 01:14:40 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* include/makeinclude/ace_flags.bor: Updated ACE_XML_CFLAGS.
@@ -84,13 +91,6 @@ Thu Feb 14 00:20:39 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 	  Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
 	  suggestion.
 
-Wed Feb 13 20:13:54 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-
-	* ace/Strategies_T.cpp (make_svc_handler): Make sure that the
-	  reactor of the Svc Handler is set to the reactor from the
- 	  Creation Strategy.  Thanks to David Smith
- 	  <smithdav@tycoelectronics.com> for reporting this!
-
 Wed Feb 13 17:42:32 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Configuration.cpp (operator=): Fixed a warning in g+
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ba5277be77f..5e291466cc6 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Feb 14 08:17:40 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Strategies_T.h:
+	* ace/Strategies_T.i: Allow the reactor of the Svc Handler to be
+	  set to the reactor passed to the Creation Strategy.  Thanks to
+ 	  David Smith <smithdav@tycoelectronics.com> for motivating this.
+
 Thu Feb 14 01:14:40 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* include/makeinclude/ace_flags.bor: Updated ACE_XML_CFLAGS.
@@ -84,13 +91,6 @@ Thu Feb 14 00:20:39 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 	  Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
 	  suggestion.
 
-Wed Feb 13 20:13:54 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-
-	* ace/Strategies_T.cpp (make_svc_handler): Make sure that the
-	  reactor of the Svc Handler is set to the reactor from the
- 	  Creation Strategy.  Thanks to David Smith
- 	  <smithdav@tycoelectronics.com> for reporting this!
-
 Wed Feb 13 17:42:32 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Configuration.cpp (operator=): Fixed a warning in g+
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ba5277be77f..5e291466cc6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu Feb 14 08:17:40 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Strategies_T.h:
+	* ace/Strategies_T.i: Allow the reactor of the Svc Handler to be
+	  set to the reactor passed to the Creation Strategy.  Thanks to
+ 	  David Smith <smithdav@tycoelectronics.com> for motivating this.
+
 Thu Feb 14 01:14:40 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* include/makeinclude/ace_flags.bor: Updated ACE_XML_CFLAGS.
@@ -84,13 +91,6 @@ Thu Feb 14 00:20:39 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 	  Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
 	  suggestion.
 
-Wed Feb 13 20:13:54 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
-
-	* ace/Strategies_T.cpp (make_svc_handler): Make sure that the
-	  reactor of the Svc Handler is set to the reactor from the
- 	  Creation Strategy.  Thanks to David Smith
- 	  <smithdav@tycoelectronics.com> for reporting this!
-
 Wed Feb 13 17:42:32 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Configuration.cpp (operator=): Fixed a warning in g+
diff --git a/THANKS b/THANKS
index f30388e893b..5346f099964 100644
--- a/THANKS
+++ b/THANKS
@@ -1448,6 +1448,7 @@ M Schulze <m2.schulze@gmx.net>
 John Michael Zorko <j.zorko@att.net>
 Ami Bar <amib@rit.co.il>
 David Smith <smithdav@tycoelectronics.com>
+Peter van Merkerk <Peter.van.Merkerk@meco.nl>
 
 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/Strategies_T.cpp b/ace/Strategies_T.cpp
index 0ee3625bf65..70924c3bc31 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -117,7 +117,6 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
     }
 
   sh = svc_handler;
-  sh->reactor (this->reactor ());
   return 0;
 }
 
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index 4c9c327cffa..3e540768411 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -77,10 +77,13 @@ public:
   // = Initialization and termination methods.
 
   /// Default constructor.
-  ACE_Creation_Strategy (ACE_Thread_Manager * = 0);
+  ACE_Creation_Strategy (ACE_Thread_Manager * = 0,
+                         ACE_Reactor * = ACE_Reactor::instance ());
 
-  /// A <Thread_Manager> is useful when creating active objects.
-  int open (ACE_Thread_Manager * = 0);
+  /// A <Thread_Manager> is useful when creating active objects and
+  /// the <ACE_Reactor> is used to initialize the service handler's reactor.
+  int open (ACE_Thread_Manager * = 0,
+            ACE_Reactor * = ACE_Reactor::instance ());
 
   virtual ~ACE_Creation_Strategy (void);
 
@@ -102,6 +105,9 @@ public:
 protected:
   /// Pointer to a thread manager.
   ACE_Thread_Manager *thr_mgr_;
+
+  /// Pointer to an ACE_Reactor.
+  ACE_Reactor *reactor_;
 };
 
 /**
diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i
index e6376aee006..b296457a9e5 100644
--- a/ace/Strategies_T.i
+++ b/ace/Strategies_T.i
@@ -54,18 +54,21 @@ ACE_Singleton_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 }
 
 template <class SVC_HANDLER> ASYS_INLINE int
-ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr)
+ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr,
+                                          ACE_Reactor *reactor)
 {
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::open");
   this->thr_mgr_ = thr_mgr;
+  this->reactor_ = reactor;
   return 0;
 }
 
 template <class SVC_HANDLER> ASYS_INLINE
-ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *thr_mgr)
+ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *thr_mgr,
+                                                           ACE_Reactor *reactor)
 {
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy");
-  if (this->open (thr_mgr) == -1)
+  if (this->open (thr_mgr, reactor) == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_Creation_Strategy")));
@@ -81,6 +84,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 
   if (sh == 0)
     ACE_NEW_RETURN (sh, SVC_HANDLER (this->thr_mgr_), -1);
+  sh->reactor (this->reactor_);
   return 0;
 }
 
diff --git a/ace/config-all.h b/ace/config-all.h
index ad3ee0de2fd..4832c88c23a 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -422,12 +422,12 @@
 
 #    define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \
    do { try { POINTER = new CONSTRUCTOR; } \
-        catch (ACE_bad_alloc) { errno = ENOMEM; return RET_VAL; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return RET_VAL; } \
    } while (0)
 
 #    define ACE_NEW(POINTER,CONSTRUCTOR) \
    do { try { POINTER = new CONSTRUCTOR; } \
-        catch (ACE_bad_alloc) { errno = ENOMEM; return; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return; } \
    } while (0)
 #  endif /* ACE_HAS_NEW_NOTHROW */