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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/20 02:09:08

  Modified:    src/main/org/jboss/remoting/callback  Tag:
                        remoting_2_2_2_experimental
                        ServerInvokerCallbackHandler.java
  Log:
  JBREM-782:  Moved callbackClient.connect() from init() to connect().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.10.2.2.2.2 +11 -1     JBossRemoting/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvokerCallbackHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java,v
  retrieving revision 1.15.2.10.2.2.2.1
  retrieving revision 1.15.2.10.2.2.2.2
  diff -u -b -r1.15.2.10.2.2.2.1 -r1.15.2.10.2.2.2.2
  --- ServerInvokerCallbackHandler.java	18 Aug 2007 01:13:18 -0000	1.15.2.10.2.2.2.1
  +++ ServerInvokerCallbackHandler.java	20 Aug 2007 06:09:08 -0000	1.15.2.10.2.2.2.2
  @@ -144,6 +144,17 @@
         init(invocation, owner);
      }
   
  +   public void connect() throws Exception
  +   {
  +      if (callBackClient != null)
  +      {
  +         if (callBackClient.isConnected())
  +            return;
  +         callBackClient.connect();
  +      }
  +         
  +   }
  +
      private void init(InvocationRequest invocation, ServerInvoker owner) throws Exception
      {
         clientSessionId = invocation.getSessionId();
  @@ -195,7 +206,6 @@
            configureSocketFactory(metadata, owner);
   
            callBackClient = new Client(invocation.getLocator(), invocation.getSubsystem(), metadata);
  -         callBackClient.connect();
            createCallbackErrorHandler(owner, invocation.getSubsystem());
         }
         else