*** empty log message ***

3 files changed, 41 insertions, 34 deletions

diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp
index 17324e9cca9..68bd0f7c1ff 100644
--- a/examples/Connection/non_blocking/CPP-connector.cpp
+++ b/examples/Connection/non_blocking/CPP-connector.cpp
@@ -31,13 +31,11 @@ Peer_Handler<PR_ST_2>::open (void *)
 #if defined (ACE_WIN32)
     // On Win32, the std handle must be registered directly (and not
     // as a socket)
-    this->reactor ()->register_handler 
-      (this, ACE_STDIN);
+    this->reactor ()->register_handler (this, ACE_STDIN);
 #else
     // On non-Win32, the std handle must be registered as a normal
     // handle with the READ mask
-    this->reactor ()->register_handler 
-      (ACE_STDIN, this, ACE_Event_Handler::READ_MASK);
+    this->reactor ()->register_handler (ACE_STDIN, this, ACE_Event_Handler::READ_MASK);
 #endif /* ACE_WIN32 */
   else
     {
@@ -51,19 +49,6 @@ Peer_Handler<PR_ST_2>::open (void *)
 }
 
 template <PR_ST_1> int
-Peer_Handler<PR_ST_2>::disconnecting (void)
-{
-  char buf[BUFSIZ];
-  ssize_t n = this->peer ().recv (buf, sizeof buf);
-
-  if (n > 0)
-    ACE_OS::write (ACE_STDOUT, buf, n);
-
-  this->action_ = &Peer_Handler<PR_ST_2>::idle;
-  return -1;
-}
-
-template <PR_ST_1> int
 Peer_Handler<PR_ST_2>::idle (void)
 {
   ACE_DEBUG ((LM_DEBUG, "idle!\n"));
@@ -84,7 +69,6 @@ Peer_Handler<PR_ST_2>::connected (void)
       if (this->peer ().close () == -1) 
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "close"), 1);
 
-      this->action_ = &Peer_Handler<PR_ST_2>::disconnecting;
       return -1;
     }
   else
@@ -142,24 +126,23 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE,
 {
   ACE_DEBUG ((LM_DEBUG, "closing down (%d)\n", mask));
 
-  // When the socket closes down, then we'll switch over to reading
-  // from stdin and writing to stdout.
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    {
-      this->action_ = &Peer_Handler<PR_ST_2>::stdio;
-      this->peer ().close ();
-      ACE_OS::rewind (stdin);
-
-      if (this->reactor ())
-	return ACE::register_stdin_handler 
-	(this, this->reactor (), ACE_Thread_Manager::instance ());
-      else
-	return 0;
-    }
-  else if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+  this->action_ = &Peer_Handler<PR_ST_2>::stdio;
+  this->peer ().close ();
+  ACE_OS::rewind (stdin);
+  
+  if (this->reactor ())
+#if defined (ACE_WIN32)
+    // On Win32, the std handle must be registered directly (and not
+    // as a socket)
+    return this->reactor ()->register_handler (this, ACE_STDIN);
+#else
+  // On non-Win32, the std handle must be registered as a normal
+  // handle with the READ mask
+  return this->reactor ()->register_handler (ACE_STDIN, this, ACE_Event_Handler::READ_MASK);
+#endif /* ACE_WIN32 */
+  else
     delete this;
   return 0;
-
 }
 
 template <class SH, PR_CO_1> int
diff --git a/examples/Connection/non_blocking/non_blocking.mak b/examples/Connection/non_blocking/non_blocking.mak
index 07ac9b261af..0b294730d4b 100644
--- a/examples/Connection/non_blocking/non_blocking.mak
+++ b/examples/Connection/non_blocking/non_blocking.mak
@@ -277,6 +277,8 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Containers.cpp"\
 	{$(INCLUDE)}"\ace\Containers.h"\
 	{$(INCLUDE)}"\ace\Containers.i"\
+	{$(INCLUDE)}"\ace\Dynamic.h"\
+	{$(INCLUDE)}"\ace\Dynamic.i"\
 	{$(INCLUDE)}"\ace\Event_Handler.h"\
 	{$(INCLUDE)}"\ace\Event_Handler.i"\
 	{$(INCLUDE)}"\ace\Free_List.cpp"\
@@ -315,6 +317,9 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
 	{$(INCLUDE)}"\ace\Message_Queue.h"\
 	{$(INCLUDE)}"\ace\Message_Queue.i"\
+	{$(INCLUDE)}"\ace\Module.cpp"\
+	{$(INCLUDE)}"\ace\Module.h"\
+	{$(INCLUDE)}"\ace\Module.i"\
 	{$(INCLUDE)}"\ace\Object_Manager.h"\
 	{$(INCLUDE)}"\ace\Object_Manager.i"\
 	{$(INCLUDE)}"\ace\OS.h"\
@@ -346,12 +351,17 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Strategies.h"\
 	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
 	{$(INCLUDE)}"\ace\Strategies_T.h"\
+	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\
+	{$(INCLUDE)}"\ace\Stream_Modules.h"\
+	{$(INCLUDE)}"\ace\Stream_Modules.i"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
 	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
+	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\
 	{$(INCLUDE)}"\ace\Svc_Handler.h"\
+	{$(INCLUDE)}"\ace\Svc_Handler.i"\
 	{$(INCLUDE)}"\ace\Synch.h"\
 	{$(INCLUDE)}"\ace\Synch.i"\
 	{$(INCLUDE)}"\ace\Synch_Options.h"\
@@ -360,7 +370,9 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Synch_T.i"\
 	{$(INCLUDE)}"\ace\Task.h"\
 	{$(INCLUDE)}"\ace\Task.i"\
+	{$(INCLUDE)}"\ace\Task_T.cpp"\
 	{$(INCLUDE)}"\ace\Task_T.h"\
+	{$(INCLUDE)}"\ace\Task_T.i"\
 	{$(INCLUDE)}"\ace\Thread.h"\
 	{$(INCLUDE)}"\ace\Thread.i"\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\
@@ -402,6 +414,8 @@ DEP_CPP_CPP_C=\
 	{$(INCLUDE)}"\ace\Containers.cpp"\
 	{$(INCLUDE)}"\ace\Containers.h"\
 	{$(INCLUDE)}"\ace\Containers.i"\
+	{$(INCLUDE)}"\ace\Dynamic.h"\
+	{$(INCLUDE)}"\ace\Dynamic.i"\
 	{$(INCLUDE)}"\ace\Event_Handler.h"\
 	{$(INCLUDE)}"\ace\Event_Handler.i"\
 	{$(INCLUDE)}"\ace\Free_List.cpp"\
@@ -436,6 +450,9 @@ DEP_CPP_CPP_C=\
 	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
 	{$(INCLUDE)}"\ace\Message_Queue.h"\
 	{$(INCLUDE)}"\ace\Message_Queue.i"\
+	{$(INCLUDE)}"\ace\Module.cpp"\
+	{$(INCLUDE)}"\ace\Module.h"\
+	{$(INCLUDE)}"\ace\Module.i"\
 	{$(INCLUDE)}"\ace\Object_Manager.h"\
 	{$(INCLUDE)}"\ace\Object_Manager.i"\
 	{$(INCLUDE)}"\ace\OS.h"\
@@ -459,12 +476,17 @@ DEP_CPP_CPP_C=\
 	{$(INCLUDE)}"\ace\Strategies.h"\
 	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
 	{$(INCLUDE)}"\ace\Strategies_T.h"\
+	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\
+	{$(INCLUDE)}"\ace\Stream_Modules.h"\
+	{$(INCLUDE)}"\ace\Stream_Modules.i"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
 	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
+	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\
 	{$(INCLUDE)}"\ace\Svc_Handler.h"\
+	{$(INCLUDE)}"\ace\Svc_Handler.i"\
 	{$(INCLUDE)}"\ace\Synch.h"\
 	{$(INCLUDE)}"\ace\Synch.i"\
 	{$(INCLUDE)}"\ace\Synch_Options.h"\
@@ -473,7 +495,9 @@ DEP_CPP_CPP_C=\
 	{$(INCLUDE)}"\ace\Synch_T.i"\
 	{$(INCLUDE)}"\ace\Task.h"\
 	{$(INCLUDE)}"\ace\Task.i"\
+	{$(INCLUDE)}"\ace\Task_T.cpp"\
 	{$(INCLUDE)}"\ace\Task_T.h"\
+	{$(INCLUDE)}"\ace\Task_T.i"\
 	{$(INCLUDE)}"\ace\Thread.h"\
 	{$(INCLUDE)}"\ace\Thread.i"\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\
diff --git a/examples/Connection/non_blocking/non_blocking.mdp b/examples/Connection/non_blocking/non_blocking.mdp
index 16ba7b3efd3..fb414bef6f9 100644
--- a/examples/Connection/non_blocking/non_blocking.mdp
+++ b/examples/Connection/non_blocking/non_blocking.mdp