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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/21 23:27:45

  Modified:    src/main/org/jboss/remoting/callback  Tag: remoting_2_x
                        ServerInvokerCallbackHandler.java
  Log:
  JBREM-641:  Removed DEFAULT_CALLBACK_TIMEOUT, reduced the level of some log statements.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.12 +4 -10     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.11
  retrieving revision 1.15.2.12
  diff -u -b -r1.15.2.11 -r1.15.2.12
  --- ServerInvokerCallbackHandler.java	5 May 2007 07:41:12 -0000	1.15.2.11
  +++ ServerInvokerCallbackHandler.java	22 May 2007 03:27:45 -0000	1.15.2.12
  @@ -73,7 +73,7 @@
      private String listenerId;
      private String clientSessionId;
      private InvokerLocator serverLocator;
  -   private int blockingTimeout = DEFAULT_BLOCKING_TIMEOUT;
  +   private int blockingTimeout = ServerInvoker.DEFAULT_BLOCKING_TIMEOUT;
      
   
      private SerializableStore callbackStore = null;
  @@ -124,12 +124,6 @@
      private double memPercentCeiling = 20; // 20% by default
      
      /**
  -    * Default timeout for getting callbacks in blocking mode.
  -    * Default is 5000 milliseconds.
  -    */
  -   public static final int DEFAULT_BLOCKING_TIMEOUT = 5000;
  -
  -   /**
       * Maps an ID to a CallbackListener for a Callback waiting to be acknowledged.
       */
      private Map idToListenerMap = Collections.synchronizedMap(new HashMap());
  @@ -552,10 +546,10 @@
            }
         }
   
  -      if (true)
  +      if (trace)
         {
  -         log.info("block: " + blocking);
  -         log.info("blocking timeout: " + currentBlockingTimeout);
  +         log.trace("block: " + blocking);
  +         log.trace("blocking timeout: " + currentBlockingTimeout);
         }
   
         synchronized (callbacks)