[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/lease/socket/multiple ...

[Tom Elrod]

  User: telrod  
  Date: 06/09/20 00:22:26

  Modified:    src/tests/org/jboss/test/remoting/lease/socket/multiple  
                        SocketLeaseTestClient.java
                        SocketLeaseTestServer.java
  Log:
  JBREM-596 - fix for leasing problem when have multiple clients using same client invoker.  Basically moved all lease managment for clients into the client invokers themselves.
  
  Revision  Changes    Path
  1.3       +17 -10    JBossRemoting/src/tests/org/jboss/test/remoting/lease/socket/multiple/SocketLeaseTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketLeaseTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/lease/socket/multiple/SocketLeaseTestClient.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SocketLeaseTestClient.java	15 Sep 2006 15:49:02 -0000	1.2
  +++ SocketLeaseTestClient.java	20 Sep 2006 04:22:26 -0000	1.3
  @@ -6,7 +6,6 @@
   import org.jboss.remoting.callback.Callback;
   import org.jboss.remoting.callback.HandleCallbackException;
   import org.jboss.remoting.callback.InvokerCallbackHandler;
  -import org.jboss.remoting.transport.Connector;
   
   import java.util.HashMap;
   import java.util.Map;
  @@ -24,6 +23,14 @@
      private String locatorURI = transport + "://" + host + ":" + port + "/?" + InvokerLocator.CLIENT_LEASE + "=" + "true";
      private String callbackLocatorURI = transport + "://" + host + ":" + (port + 1);
   
  +//   public void setUp()
  +//   {
  +//      org.apache.log4j.BasicConfigurator.configure();
  +//      org.apache.log4j.Category.getRoot().setLevel(Level.INFO);
  +//      org.apache.log4j.Category.getInstance("org.jboss.remoting").setLevel(XLevel.TRACE);
  +//      org.apache.log4j.Category.getInstance("org.jgroups").setLevel(Level.FATAL);
  +//   }
  +
      protected String getLocatorUri()
      {
         return locatorURI;
  @@ -34,19 +41,19 @@
         InvokerLocator locator = new InvokerLocator(getLocatorUri());
         System.out.println("Calling remoting server with locator uri of: " + getLocatorUri());
   
  -      InvokerLocator callbackLocator = new InvokerLocator(callbackLocatorURI);
  -      Connector callbackConnector = new Connector(callbackLocator);
  -      callbackConnector.create();
  -      callbackConnector.start();
  +      //InvokerLocator callbackLocator = new InvokerLocator(callbackLocatorURI);
  +      //Connector callbackConnector = new Connector(callbackLocator);
  +      //callbackConnector.create();
  +      //callbackConnector.start();
   
  -      TestCallbackHandler callbackHandler = new TestCallbackHandler();
  +      //TestCallbackHandler callbackHandler = new TestCallbackHandler();
   
         Map metadata = new HashMap();
         metadata.put("clientName", "test1");
         Client remotingClient1 = new Client(locator, metadata);
         remotingClient1.connect();
   
  -      remotingClient1.addListener(callbackHandler, callbackLocator);
  +      //remotingClient1.addListener(callbackHandler, callbackLocator);
   
         Object ret = remotingClient1.invoke("test1");
         System.out.println("Response was: " + ret);
  @@ -58,7 +65,7 @@
         metadata2.put("clientName", "test1");
         Client remotingClient2 =new Client(locator, metadata2);
         remotingClient2.connect();
  -      remotingClient2.addListener(callbackHandler, callbackLocator);
  +      //remotingClient2.addListener(callbackHandler, callbackLocator);
   
         ret = remotingClient2.invoke("test2");
         System.out.println("Response was: " + ret);
  @@ -70,7 +77,7 @@
   
         if(remotingClient1 != null)
         {
  -         remotingClient1.removeListener(callbackHandler);
  +         //remotingClient1.removeListener(callbackHandler);
            remotingClient1.disconnect();
         }
   
  @@ -84,7 +91,7 @@
   
         if(remotingClient2 != null)
         {
  -         remotingClient2.removeListener(callbackHandler);
  +         //remotingClient2.removeListener(callbackHandler);
            remotingClient2.disconnect();
         }
   
  
  
  
  1.2       +0 -1      JBossRemoting/src/tests/org/jboss/test/remoting/lease/socket/multiple/SocketLeaseTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketLeaseTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/lease/socket/multiple/SocketLeaseTestServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SocketLeaseTestServer.java	14 Sep 2006 20:35:27 -0000	1.1
  +++ SocketLeaseTestServer.java	20 Sep 2006 04:22:26 -0000	1.2
  @@ -21,7 +21,6 @@
         org.apache.log4j.BasicConfigurator.configure();
         org.apache.log4j.Category.getRoot().setLevel(Level.INFO);
         org.apache.log4j.Category.getInstance("org.jboss.remoting").setLevel(XLevel.TRACE);
  -      org.apache.log4j.Category.getInstance("org.jboss.remoting.ServerInvoker").setLevel(XLevel.TRACE);
         org.apache.log4j.Category.getInstance("org.jgroups").setLevel(Level.FATAL);
   
         final LeaseTestServer server = new SocketLeaseTestServer();