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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/21 23:42:29

  Modified:    src/main/org/jboss/remoting/callback  Tag: remoting_2_x
                        CallbackPoller.java
  Log:
  JBREM-641:  Changed ServerInvoker.BLOCK to ServerInvoker.BLOCKING.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.9   +4 -4      JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackPoller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java,v
  retrieving revision 1.5.2.8
  retrieving revision 1.5.2.9
  diff -u -b -r1.5.2.8 -r1.5.2.9
  --- CallbackPoller.java	22 May 2007 03:32:05 -0000	1.5.2.8
  +++ CallbackPoller.java	22 May 2007 03:42:29 -0000	1.5.2.9
  @@ -508,7 +508,7 @@
            {
               if (val instanceof String)
               {
  -               if (ServerInvoker.BLOCK.equals(val))
  +               if (ServerInvoker.BLOCKING.equals(val))
                  {
                     blocking = true;
                  }
  @@ -520,8 +520,8 @@
                  {
                     log.warn("Value for " + ServerInvoker.BLOCKING_MODE + 
                              " configuration is " + val + ". Must be either " +
  -                           ServerInvoker.BLOCK + " or " + ServerInvoker.NONBLOCKING +
  -                           ". Using " + ServerInvoker.BLOCK + ".");
  +                           ServerInvoker.BLOCKING + " or " + ServerInvoker.NONBLOCKING +
  +                           ". Using " + ServerInvoker.BLOCKING + ".");
                  }
               }
               else
  @@ -534,7 +534,7 @@
            
            // Default blocking mode on server is nonblocking.
            if (blocking)
  -            metadata.put(ServerInvoker.BLOCKING_MODE, ServerInvoker.BLOCK);
  +            metadata.put(ServerInvoker.BLOCKING_MODE, ServerInvoker.BLOCKING);
            
            val = metadata.get(ServerInvoker.BLOCKING_TIMEOUT);
            if (val != null)