[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...

[Ron Sigal]

  User: rsigal  
  Date: 07/02/24 04:20:02

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x Client.java
  Log:
  JBREM-708:  In readExternal() assign incoming InvokerLocator to instance variable.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.53.2.24 +3 -37     JBossRemoting/src/main/org/jboss/remoting/Client.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Client.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Client.java,v
  retrieving revision 1.53.2.23
  retrieving revision 1.53.2.24
  diff -u -b -r1.53.2.23 -r1.53.2.24
  --- Client.java	21 Feb 2007 10:55:23 -0000	1.53.2.23
  +++ Client.java	24 Feb 2007 09:20:02 -0000	1.53.2.24
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.53.2.23 $
  + * @version $Revision: 1.53.2.24 $
    */
   public class Client implements Externalizable
   {
  @@ -287,7 +287,7 @@
         {
            case Version.VERSION_2:
            {
  -            InvokerLocator readLocator = (InvokerLocator) in.readObject();
  +            this.locator = (InvokerLocator) in.readObject();
               this.subsystem = (String) in.readObject();
               this.configuration = (Map) in.readObject();
               boolean wasConnected = in.readBoolean();
  @@ -295,7 +295,7 @@
               this.classloader = Thread.currentThread().getContextClassLoader();
               try
               {
  -               this.invoker = InvokerRegistry.createClientInvoker(readLocator, configuration);
  +               this.invoker = InvokerRegistry.createClientInvoker(locator, configuration);
                  if(wasConnected)
                  {
                     connect();
  @@ -984,11 +984,6 @@
                  }
   
                  listeners.remove(callbackHandler);
  -
  -//             // have a pull callback handler
  -//             Map metadata = new HashMap();
  -//             metadata.put(LISTENER_ID_KEY, listenerId);
  -//             invoke(new InternalInvocation(InternalInvocation.REMOVELISTENER, null), metadata);
               }
               else
               {
  @@ -1031,33 +1026,11 @@
   
                        client.invoke(ii, metadata);
                        client.disconnect();
  -//
  -//                   // now call target server to remove listener
  -//                   invoke(new InternalInvocation(InternalInvocation.REMOVELISTENER, null), metadata);
  -
                     }
                  }
               }
   
  -//          Map metadata = createListenerMetadata(callbackHandler);
  -//          String listenerId = (String) metadata.get(LISTENER_ID_KEY);
  -//          // connect to the given client locator and remove handler as listener
  -//          InvokerLocator locator = invoker.getClientLocator(listenerId);
  -//          if (locator != null) // async callback
  -//          {
  -//          Client client = new Client(locator, subsystem);
  -//          client.setSessionId(getSessionId());
  -//          client.connect();
  -//          client.invoke(new InternalInvocation(InternalInvocation.REMOVECLIENTLISTENER,
  -//          new Object[]{callbackHandler}),
  -//          metadata);
  -//          client.disconnect();
  -//          }
  -//          // now call server to remove listener
  -//          invoke(new InternalInvocation(InternalInvocation.REMOVELISTENER, null), metadata);
  -
               // clean up callback server connector if one exists
  -
               Connector callbackConnector = (Connector) callbackConnectors.remove(callbackHandler);
   
               if (callbackConnector != null)
  @@ -1065,13 +1038,6 @@
                  callbackConnector.stop();
                  callbackConnector.destroy();
               }
  -
  -//          // clean up callback poller if one exists
  -//          CallbackPoller callbackPoller = (CallbackPoller) callbackPollers.remove(callbackHandler);
  -//          if (callbackPoller != null)
  -//          {
  -//          callbackPoller.stop();
  -//          }
            }
            else
            {