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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/22 23:01:33

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_2_0_GA
                        ServerInvoker.java
  Log:
  JBREM-641, JBREM-781, JBREM-782:  Merged changes from branch remoting_2_2_2_experimental.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.28.4.4 +35 -9     JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.52.2.28.4.3
  retrieving revision 1.52.2.28.4.4
  diff -u -b -r1.52.2.28.4.3 -r1.52.2.28.4.4
  --- ServerInvoker.java	15 Aug 2007 17:32:30 -0000	1.52.2.28.4.3
  +++ ServerInvoker.java	23 Aug 2007 03:01:33 -0000	1.52.2.28.4.4
  @@ -67,7 +67,7 @@
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.52.2.28.4.3 $
  + * @version $Revision: 1.52.2.28.4.4 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -174,6 +174,35 @@
       */
      public static final int DEFAULT_TIMEOUT_PERIOD = 60000;
   
  +   /**
  +    * The key to be used to determine if pull callbacks should be obtained in 
  +    *  blocking or nonblocking mode
  +    */
  +   public static final String BLOCKING_MODE = "blockingMode";
  +   
  +   /**
  +    * The key value to use to specify timeout for getting callbacks in blocking mode
  +    */ 
  +   public static final String BLOCKING_TIMEOUT = "blockingTimeout";
  +   
  +   /**
  +    * The value associated with BLOCKING_MODE that indicates that pull callbacks
  +    * should be obtained in blocking mode;
  +    */
  +   public static final String BLOCKING = "blocking";
  +   
  +   /**
  +    * The value associated with BLOCKING_MODE that indicates that pull callbacks
  +    * should be obtained in nonblocking mode;
  +    */
  +   public static final String NONBLOCKING = "nonblocking";
  +   
  +   /**
  +    * Default timeout for getting callbacks in blocking mode.
  +    * Default is 5000 milliseconds.
  +    */
  +   public static final int DEFAULT_BLOCKING_TIMEOUT = 5000;
  +
   
      // Static ---------------------------------------------------------------------------------------
   
  @@ -1371,7 +1400,7 @@
         {
            ServerInvokerCallbackHandler callbackHandler = getCallbackHandler(invocation);
            if(trace) { log.trace("ServerInvoker (" + this + ") getting callbacks for callback handler " + callbackHandler + "."); }
  -         result = callbackHandler.getCallbacks();
  +         result = callbackHandler.getCallbacks(invocation.getRequestPayload());
         }
         else if(InternalInvocation.ACKNOWLEDGECALLBACK.equals(methodName))
         {
  @@ -1666,19 +1695,16 @@
         synchronized(callbackHandlers)
         {
            callbackHandler = (ServerInvokerCallbackHandler)callbackHandlers.get(id);
  -      }
         
         // if does not exist, create it
         if(callbackHandler == null)
         {
            callbackHandler = new ServerInvokerCallbackHandler(invocation, getLocator(), this);
  -
  -         synchronized(callbackHandlers)
  -         {
               callbackHandlers.put(id, callbackHandler);
            }
         }
   
  +      callbackHandler.connect();
         if(trace) { log.trace("ServerInvoker (" + this + ") adding server callback handler " + callbackHandler + " with id of " + id + "."); }
         return callbackHandler;
      }