[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex ...

[Ron Sigal]

  User: rsigal  
  Date: 06/08/29 02:16:37

  Modified:    src/tests/org/jboss/test/remoting/transport/multiplex  
                        LateClientShutdownTestClient.java
                        LateClientShutdownTestServer.java
  Log:
  JBREM-593:  Added a synchronizing ServerSocket.
  
  Revision  Changes    Path
  1.2       +19 -0     JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/LateClientShutdownTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LateClientShutdownTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/LateClientShutdownTestClient.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LateClientShutdownTestClient.java	20 Jul 2006 07:29:25 -0000	1.1
  +++ LateClientShutdownTestClient.java	29 Aug 2006 06:16:37 -0000	1.2
  @@ -21,6 +21,8 @@
    */
   package org.jboss.test.remoting.transport.multiplex;
   
  +import java.net.InetAddress;
  +import java.net.Socket;
   import java.util.HashMap;
   
   import org.jboss.remoting.Client;
  @@ -54,6 +56,23 @@
         try
         {
            Client client = new Client(new InvokerLocator(LateClientShutdownTestServer.serverLocatorURI), conf);
  +         Socket s = null;
  +         
  +         for (int i = 0; i < 5; i++)
  +         {
  +            try
  +            {
  +               s = new Socket(InetAddress.getLocalHost(), LateClientShutdownTestServer.syncSocketPort);
  +               if (s != null)
  +                  break;
  +            }
  +            catch (Exception e) {}
  +         }
  +         
  +         if (s == null)
  +            throw new Exception("cannot connect to server");
  +         
  +         s.close();
            System.out.println("connecting client");
            client.connect();
            System.out.println("client connected");
  
  
  
  1.2       +6 -0      JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/LateClientShutdownTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LateClientShutdownTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/LateClientShutdownTestServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LateClientShutdownTestServer.java	20 Jul 2006 07:29:25 -0000	1.1
  +++ LateClientShutdownTestServer.java	29 Aug 2006 06:16:37 -0000	1.2
  @@ -21,12 +21,15 @@
    */
   package org.jboss.test.remoting.transport.multiplex;
   
  +import java.net.ServerSocket;
  +
   import org.jboss.jrunit.extensions.ServerTestCase;
   import org.jboss.remoting.transport.Connector;
   
   public class LateClientShutdownTestServer extends ServerTestCase
   {
      public static String serverLocatorURI = "multiplex://localhost:4455";
  +   public static int syncSocketPort = 5544;
      
      static class Server extends Thread
      {
  @@ -38,6 +41,9 @@
               connector.create();
               connector.start();
               System.out.println("server started");
  +            ServerSocket ss = new ServerSocket(syncSocketPort);
  +            ss.accept();
  +            ss.close();
               Thread.sleep(4000);
               connector.stop();
               System.out.println("server stopped");