*** empty log message ***

4 files changed, 61 insertions, 57 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index ed94bf64b07..65541d5670f 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,16 +1,56 @@
+Tue May  6 07:39:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/Service_Config.cpp (open): Make sure to perform the
+ 	  daemonization logic first so that we get a new process created
+ 	  before initializing reactors, etc.  Thanks to Adrian Salt
+ 	  <acsalt@magi.com> for reporting this.
+
+	* examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): 
+	  Changed ACE::INVALID_HANDLE to ACE_INVALID_HANDLE.
+	  Thanks to Dani Flexer <danif@alice.actcom.co.il> for
+	  reporting this.
+
+	* tests/Conn_Test.cpp (compare_i): Changed the comparison from
+	  a1 == a2 to a1 != a2 since this appears to be what is needed.
+	  We need to improve the comments here!
+
+	* tests/Conn_Test.cpp: Split the definition of the Svc_Handler
+ 	  template into its own Conn_Test.h file to work around "features"
+ 	  with AIX C++.  Thanks to Chris Lahey for reporting this.
+
+	* ace/Containers.cpp: Fixed a bug in the set() method for
+ 	  ACE_Unbounded_Queue.  Again, thank goodness for cs242!
+
+	* ace/Containers.cpp: Fixed a bug in the enqueue_head() logic for
+ 	  ACE_Unbounded_Queue.  Thank goodness for cs242 ;-).
+
+	* ace/Containers.cpp: Added a destructor for ACE_Node to keep the
+ 	  compilers happy.
+
+Tue May 06 11:31:49 1997  David L. Levine  <levine@cs.wustl.edu>
+
+	* netsvcs/lib/*.cpp: removed break statements after
+	  ACE_RETURNs to avoid unreachable statement warnings from
+	  GHS.  
+
+	* ace/OS.cpp (mktime): added time_t cast of -1 (error) return
+	  to avoid compiler warning.
+
+	* ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SIGNED_CHAR.
+
+	* ace/Containers.cpp (dequeue_head): fixed typos in variable names.
+
+	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
+	  removed #ifdef ACE_HAS_TLI around some template specializations so
+	  that this subproject will build on platforms non-TLI platforms such
+	  as Linux.
+
 Tue May  6 17:02:54 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
 	* ace/OS.{h,i}: Added strftime ().  Also, enhanced strcasecmp
 	  implementation to account for lexicographical ordering for
 	  mismatches.
 
-Tue May 06 14:36:03 1997  David L. Levine  <levine@cs.wustl.edu>
-
-	* netsvcs/lib/*.cpp: removed break statements after ACE_RETURNs to avoid unreachable
-	  statement warnings from GHS.
-
-Tue May  6 12:43:27 1997  James C Hu  <jxh@polka.cs.wustl.edu>
-
 	* apps/JAWS/server/Parse_Headers.{h,cpp} (class Headers_Map):
           Changed signature of casting operator to return a pointer
           rather than a reference to a constant pointer, to fix
@@ -45,44 +85,6 @@ Tue May  6 12:43:27 1997  James C Hu  <jxh@polka.cs.wustl.edu>
 
           SGI fixes.
 
-Tue May  6 07:39:25 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp (main): 
-	  Changed ACE::INVALID_HANDLE to ACE_INVALID_HANDLE.
-	  Thanks to Dani Flexer <danif@alice.actcom.co.il> for
-	  reporting this.
-
-	* tests/Conn_Test.cpp (compare_i): Changed the comparison from
-	  a1 == a2 to a1 != a2 since this appears to be what is needed.
-	  We need to improve the comments here!
-
-	* tests/Conn_Test.cpp: Split the definition of the Svc_Handler
- 	  template into its own Conn_Test.h file to work around "features"
- 	  with AIX C++.  Thanks to Chris Lahey for reporting this.
-
-	* ace/Containers.cpp: Fixed a bug in the set() method for
- 	  ACE_Unbounded_Queue.  Again, thank goodness for cs242!
-
-	* ace/Containers.cpp: Fixed a bug in the enqueue_head() logic for
- 	  ACE_Unbounded_Queue.  Thank goodness for cs242 ;-).
-
-	* ace/Containers.cpp: Added a destructor for ACE_Node to keep the
- 	  compilers happy.
-
-Tue May 06 11:31:49 1997  David L. Levine  <levine@cs.wustl.edu>
-
-	* ace/OS.cpp (mktime): added time_t cast of -1 (error) return
-	  to avoid compiler warning.
-
-	* ace/config-vxworks-ghs-1.8.h: added ACE_LACKS_SIGNED_CHAR.
-
-	* ace/Containers.cpp (dequeue_head): fixed typos in variable names.
-
-	* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-	  removed #ifdef ACE_HAS_TLI around some template specializations so
-	  that this subproject will build on platforms non-TLI platforms such
-	  as Linux.
-
 Tue May  6 00:00:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
 	* ace/Message_Block.cpp: Added template specialization for
diff --git a/README b/README
index 5de692fba05..a347b17c4a6 100644
--- a/README
+++ b/README
@@ -506,6 +506,7 @@ Jeremy Buch <davinci@nortel.ca>
 Kevin Boyle <kboyle@sanwafp.com>
 Kevin Martindale <kevin_martindale@stortek.com>
 Luis Lopes <llopes@tick.rcc.Ryerson.CA>
+Adrian Salt <acsalt@magi.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/Service_Config.cpp b/ace/Service_Config.cpp
index 86e58214088..bbbd4e9cd12 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -587,6 +587,10 @@ ACE_Service_Config::open (const char program_name[])
 {   
   ACE_TRACE ("ACE_Service_Config::open");
 
+  // Become a daemon before doing anything else.
+  if (ACE_Service_Config::be_a_daemon_)
+    ACE_Service_Config::start_daemon ();	 
+
   // Only use STDERR if the users hasn't already set the flags.
   if (ACE_LOG_MSG->open (program_name, 
 			 ACE_LOG_MSG->flags () ? ACE_LOG_MSG->flags () : (u_long) ACE_Log_Msg::STDERR,
@@ -617,9 +621,6 @@ ACE_Service_Config::open (const char program_name[])
       ACE_Service_Config::delete_reactor_ = 1;
     }
 
-  if (ACE_Service_Config::be_a_daemon_)
-    ACE_Service_Config::start_daemon ();	 
-
   // Register ourselves to receive reconfiguration requests via
   // signals!
 
@@ -960,6 +961,15 @@ ACE_Service_Config::reconfig_occurred (sig_atomic_t config_occurred)
   ACE_Service_Config::reconfig_occurred_ = config_occurred;
 }
 
+// Become a daemon (i.e., run as a "background" process).
+
+int
+ACE_Service_Config::start_daemon (void)
+{
+  ACE_TRACE ("ACE_Service_Config::start_daemon");
+  return ACE::daemonize ();
+}
+
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Node<ACE_Static_Svc_Descriptor *>;
 template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
diff --git a/ace/Service_Config.i b/ace/Service_Config.i
index 2940c580a4c..f14659e6d92 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.i
@@ -3,15 +3,6 @@
 
 // Service_Config.i
 
-// Become a daemon (i.e., run as a "background" process).
-
-ACE_INLINE int
-ACE_Service_Config::start_daemon (void)
-{
-  ACE_TRACE ("ACE_Service_Config::start_daemon");
-  return ACE::daemonize ();
-}
-
 // This is the primary entry point into the ACE_Service_Config (the
 // constructor just handles simple initializations).