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

[Ron Sigal]

  User: rsigal  
  Date: 06/08/02 20:37:40

  Modified:    src/tests/org/jboss/test/remoting/transport/multiplex/config  
                        ClientConfigurationTestClient.java
                        ClientConfigurationTestServer.java
  Log:
  JBREM-563:  Added additional synchronization between client and server so server is running before client starts.
  
  Revision  Changes    Path
  1.2       +12 -2     JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/config/ClientConfigurationTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientConfigurationTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/config/ClientConfigurationTestClient.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ClientConfigurationTestClient.java	20 May 2006 04:36:38 -0000	1.1
  +++ ClientConfigurationTestClient.java	3 Aug 2006 00:37:40 -0000	1.2
  @@ -22,6 +22,7 @@
   
   package org.jboss.test.remoting.transport.multiplex.config;
   
  +import java.io.InputStream;
   import java.io.OutputStream;
   import java.net.Socket;
   
  @@ -40,9 +41,11 @@
    */
   public class ClientConfigurationTestClient extends TestCase
   {
  -   protected Logger log = Logger.getLogger(ClientConfigurationTestClient.class);
  +   protected static Logger log = Logger.getLogger(ClientConfigurationTestClient.class);
  +   protected static boolean connectorStarted;
      protected Socket syncSocket;
      protected OutputStream os;
  +   protected InputStream is;
      
      
      public void setUp()
  @@ -51,6 +54,13 @@
         {
            syncSocket = new Socket(ClientConfigurationTestServer.syncHost, ClientConfigurationTestServer.syncPort);
            os = syncSocket.getOutputStream();
  +         is = syncSocket.getInputStream();
  +         
  +         if (!connectorStarted)
  +         {
  +            is.read();
  +            connectorStarted = true;
  +         }
         }
         catch (Exception e)
         {
  
  
  
  1.2       +4 -1      JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/config/ClientConfigurationTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientConfigurationTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/config/ClientConfigurationTestServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ClientConfigurationTestServer.java	20 May 2006 04:36:38 -0000	1.1
  +++ ClientConfigurationTestServer.java	3 Aug 2006 00:37:40 -0000	1.2
  @@ -23,6 +23,7 @@
   package org.jboss.test.remoting.transport.multiplex.config;
   
   import java.io.InputStream;
  +import java.io.OutputStream;
   import java.net.InetSocketAddress;
   import java.net.ServerSocket;
   import java.net.Socket;
  @@ -63,12 +64,14 @@
                  ss.bind(new InetSocketAddress(syncHost, syncPort));
                  Socket syncSocket = ss.accept();
                  InputStream is = syncSocket.getInputStream();
  +               OutputStream os = syncSocket.getOutputStream();
                  log.info("got sync socket");
                  
                  // Create Connector.
                  Connector connector = new Connector(connectorURI);
                  connector.create();
                  connector.start();
  +               os.write(7);
                  log.info("started Connector on: " + connector.getInvokerLocator());
                  
                  // Wait for end of test signal.