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

[Ron Sigal]

  User: rsigal  
  Date: 07/04/11 19:47:57

  Modified:    src/main/org/jboss/remoting/transport/bisocket  Tag:
                        remoting_2_2_0_GA BisocketClientInvoker.java
  Log:
  JBREM-734:  Constructor gets parameters from InvokerLocator.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13.2.1 +17 -18    JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.13.2.1
  diff -u -b -r1.1.2.13 -r1.1.2.13.2.1
  --- BisocketClientInvoker.java	14 Mar 2007 06:13:22 -0000	1.1.2.13
  +++ BisocketClientInvoker.java	11 Apr 2007 23:47:57 -0000	1.1.2.13.2.1
  @@ -78,7 +78,6 @@
   
      private int pingFrequency = Bisocket.PING_FREQUENCY_DEFAULT;
      private int maxRetries = Bisocket.MAX_RETRIES_DEFAULT;
  -   private InvokerLocator secondaryLocator;
      private Socket controlSocket;
      private OutputStream controlOutputStream;
      private Object controlLock = new Object();
  @@ -140,9 +139,9 @@
      {
         super(locator, config);
   
  -      if (config != null)
  +      if (configuration != null)
         {
  -         listenerId = (String) config.get(Client.LISTENER_ID_KEY);
  +         listenerId = (String) configuration.get(Client.LISTENER_ID_KEY);
            if (listenerId != null)
            {
               isCallbackInvoker = true;
  @@ -151,7 +150,7 @@
            }
   
            // look for pingFrequency param
  -         Object val = config.get(Bisocket.PING_FREQUENCY);
  +         Object val = configuration.get(Bisocket.PING_FREQUENCY);
            if (val != null)
            {
               try
  @@ -231,6 +230,17 @@
         }
      }
   
  +   public int getMaxRetries()
  +   {
  +      return maxRetries;
  +   }
  +
  +
  +   public void setMaxRetries(int maxRetries)
  +   {
  +      this.maxRetries = maxRetries;
  +   }
  +   
   
      public int getPingFrequency()
      {
  @@ -257,16 +267,6 @@
   
         // Client on client side.
         super.handleConnect();
  -      
  -      try
  -      {
  -         secondaryLocator = getSecondaryLocator();
  -      }
  -      catch (Throwable e)
  -      {
  -         log.error("Unable to retrieve address/port of secondary server socket", e);
  -         throw new ConnectionFailedException(e.getMessage());
  -      }
      }
      
      
  @@ -325,7 +325,7 @@
                  listenerIdToClientInvokerMap.put(listenerId, this);
                  BisocketServerInvoker callbackServerInvoker;
                  callbackServerInvoker = BisocketServerInvoker.getBisocketServerInvoker(listenerId);
  -               callbackServerInvoker.createControlConnection(listenerId, secondaryLocator);
  +               callbackServerInvoker.createControlConnection(listenerId, true);
               }
               
               // Rather than handle the REMOVELISTENER case symmetrically, it is
  @@ -425,13 +425,12 @@
            {
               Object o = invoke(r);
               log.debug("secondary locator: " + o);
  -            secondaryLocator = (InvokerLocator) o;
  -            return secondaryLocator;
  +            return (InvokerLocator) o;
            }
            catch (Exception e)
            {
               savedException = e;
  -            log.info("unable to get secondary locator: trying again");
  +            log.debug("unable to get secondary locator: trying again");
            }
         }