[242005] TCP Connector doesn't notify of disconnect until one attempts to use it

https://bugs.eclipse.org/bugs/show_bug.cgi?id=242005

1 files changed, 35 insertions, 23 deletions

diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java
index 22276dc6ad..2cbc172787 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java
@@ -12,15 +12,43 @@ package org.eclipse.net4j.tests;
 
 import org.eclipse.net4j.Net4jUtil;
 import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.tests.signal.TestSignalClientProtocolFactory;
-import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
 import org.eclipse.net4j.util.container.ManagedContainer;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.log.PrintLogHandler;
+import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
 
 /**
  * @author Eike Stepper
  */
 public class TCPConnectivityLoss
 {
+  public static ManagedContainer createContainer()
+  {
+    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
+    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
+    OMPlatform.INSTANCE.setDebugging(true);
+
+    ManagedContainer container = new ManagedContainer();
+    Net4jUtil.prepareContainer(container);
+    TCPUtil.prepareContainer(container);
+    container.activate();
+    return container;
+  }
+
+  public static void sleep() throws Exception
+  {
+    int count = 0;
+    while (System.in.available() == 0)
+    {
+      Thread.sleep(1000L);
+      System.out.print(".");
+      if (++count % 80 == 0)
+      {
+        System.out.println();
+      }
+    }
+  }
+
   /**
    * @author Eike Stepper
    */
@@ -28,17 +56,9 @@ public class TCPConnectivityLoss
   {
     public static void main(String[] args) throws Exception
     {
-      ManagedContainer container = new ManagedContainer();
-      Net4jUtil.prepareContainer(container);
-      TCPUtil.prepareContainer(container);
-      container.registerFactory(new TestSignalServerProtocolFactory());
-      container.activate();
-
+      ManagedContainer container = createContainer();
       TCPUtil.getAcceptor(container, null);
-      while (System.in.available() != 0)
-      {
-      }
-
+      sleep();
       container.deactivate();
     }
   }
@@ -50,17 +70,9 @@ public class TCPConnectivityLoss
   {
     public static void main(String[] args) throws Exception
     {
-      ManagedContainer container = new ManagedContainer();
-      Net4jUtil.prepareContainer(container);
-      TCPUtil.prepareContainer(container);
-      container.registerFactory(new TestSignalClientProtocolFactory());
-      container.activate();
-
-      TCPUtil.getConnector(container, "192.168.1.36");
-      while (System.in.available() != 0)
-      {
-      }
-
+      ManagedContainer container = createContainer();
+      TCPUtil.getConnector(container, "192.168.1.35");
+      sleep();
       container.deactivate();
     }
   }