ChangeLogTag:Tue Mar 27 19:54:11 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 44 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index aceac7e87b7..e7406bee555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,12 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
         * ace/Unbounded_Queue.h:
           Add required #include for Chorus builds.
 
+Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
+
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Select_Reactor_Base.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index aceac7e87b7..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -27,6 +27,12 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
         * ace/Unbounded_Queue.h:
           Add required #include for Chorus builds.
 
+Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
+
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Select_Reactor_Base.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index aceac7e87b7..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -27,6 +27,12 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
         * ace/Unbounded_Queue.h:
           Add required #include for Chorus builds.
 
+Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
+
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Select_Reactor_Base.h:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1ed5a3d576c..52b1481221c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -133,7 +133,6 @@ Tue Mar 27 14:20:48 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
           all the occurences of TAO_orbdebug to TAO_debug_level. That
           should hopefully fix the DLL Core builds.
 
->>>>>>> 1.2970
 Tue Mar 27 08:15:34 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp:
diff --git a/THANKS b/THANKS
index eb10cffbc89..a3c9c7a5c21 100644
--- a/THANKS
+++ b/THANKS
@@ -1183,6 +1183,7 @@ Benjamin Fry <ben@thrownet.com>
 Ram Ben-Yakir <Ram@bandwiz.com>
 Eric Desamore <Eric.Desamore@idtv.bull.net>
 John Ashmun <John.ASHMUN@esca.com>
+Przemyslaw Marciniak <pmarciniak@lucent.com>
 
 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/ACE.cpp b/ace/ACE.cpp
index 7872835c5eb..1145f5fa969 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -2215,8 +2215,12 @@ ACE::handle_ready (ACE_HANDLE handle,
   fds.events = read_ready ? POLLIN : POLLOUT;
   fds.revents = 0;
 
-  int result = ACE_OS::poll (&fds, 1, *timeout);
+  int result;
 
+  if (timeout == 0)
+    result = ACE_OS::poll (&fds, 1, 0);
+  else
+    result = ACE_OS::poll (&fds, 1, *timeout);
 #else
 
   ACE_Handle_Set handle_set;
diff --git a/docs/ACE-development-process.html b/docs/ACE-development-process.html
index 6b17c6feb15..197873e581b 100644
--- a/docs/ACE-development-process.html
+++ b/docs/ACE-development-process.html
@@ -40,24 +40,24 @@ rebuild.<p>
 The ACE+TAO development process looks like:<p>
 <ol>
   <li>Every change to ACE+TAO must have a bug report.  <em>Change</em>
-    includes fixes, enhancements, updates, and so on.<p>
+    includes fixes, enhancements, updates, and so on.
   <!-- The link to bugzilla is intentionally local. -->
-  <li><a href="http://ace/bugzilla">Create a bug report</a>.<p>
-  <li>Accept the bug report if you are going to implement the change.<p>
-  <li>Implement the change in your workspace(s).<p>
+  <li><a href="http://ace/bugzilla">Create a bug report</a>.
+  <li>Accept the bug report if you are going to implement the change.
+  <li>Implement the change in your workspace(s).
   <li>Test the change sufficiently to demonstrate that it both does
     what is intended, and doesn't break anything.  The test may be
     as simple as building and running the ACE+TAO tests on one platform.
     Or as complicated as rebuilding and test all of ACE+TAO on
-    all platforms that we have.<p>
-  <li>Create an appropriate ChangeLog entry.<p>
-  <li>Commit the change using a ChangeLogTag commit message.<p>
+    all platforms that we have.
+  <li>Create an appropriate ChangeLog entry.
+  <li>Commit the change using a ChangeLogTag commit message.
   <li>Respond to the requester of the change, if any.  Please do this
-    <em>after</em> committing your change.<p>
-  <li>Make sure that the requester is listed in the THANKS file.<p>
-  <li>Update the bug report to indicate resolution.<p>
-  <li>Monitor the next round of build/tests for problems with your change.<p>
-  <li>Respond immediately to reports of problems with your changes.<p>
+    <em>after</em> committing your change.
+  <li>Make sure that the requester is listed in the THANKS file.
+  <li>Update the bug report to indicate resolution.
+  <li>Monitor the next round of build/tests for problems with your change.
+  <li>Respond immediately to reports of problems with your changes.
 </ol>
 
 <p><hr>
@@ -103,17 +103,17 @@ platforms.  The status of all ACE+TAO builds is tracked automatically
 The build czar's role is to:<p>
 <ul>
   <li>Remind people to check build logs.  Developers are still
-    responsible for verifying that their changes are clean.<p>
+    responsible for verifying that their changes are clean.
   <li>Freeze the CVS repository when it's decided to no more
     non-critical changes will be accepted for the next kits.
     The build czar has the final say over when the freeze is
     implemented.  The tendency to implement a freeze sooner than
     later is intentional, desirable, beneficial, and the "Right Thing"[TM]
-    to do.<p>
-  <li>Verifies that the final round of builds/tests are clean.<p>
-  <li>Creates the kits.<p>
-  <li>Unfreezes the CVS repository.<p>
-  <li>Sends email to appropriate news groups announcing the new kits.<p>
+    to do.
+  <li>Verifies that the final round of builds/tests are clean.
+  <li>Creates the kits.
+  <li>Unfreezes the CVS repository.
+  <li>Sends email to appropriate news groups announcing the new kits.
   <li>Passes the mantle on to the next build czar.<p>
 </ul>
 
@@ -154,7 +154,8 @@ support. <P>
 
 <hr><p>
   <font size=-1>
-    Last modified <!--#echo var="LAST_MODIFIED" -->.<p>
+    Last modified 
+<!--#echo var="LAST_MODIFIED" -->.<p>
   </font><hr>
 
 Back to <A HREF="index.html">ACE Documentation Home</A>.