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

[Tom Elrod]

  User: telrod  
  Date: 06/09/21 14:35:26

  Modified:    src/main/org/jboss/remoting  MicroRemoteClientInvoker.java
  Log:
  JBREM-602 - fixing bug where server could send -1 as default server lease period and client would use it without checking.
  
  Revision  Changes    Path
  1.7       +6 -2      JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroRemoteClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- MicroRemoteClientInvoker.java	20 Sep 2006 04:22:26 -0000	1.6
  +++ MicroRemoteClientInvoker.java	21 Sep 2006 18:35:26 -0000	1.7
  @@ -27,7 +27,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public abstract class MicroRemoteClientInvoker extends AbstractInvoker implements ClientInvoker
   {
  @@ -371,7 +371,11 @@
                        if (respMap != null)
                        {
                           Long leaseTimeoutValue = (Long) respMap.get("clientLeasePeriod");
  -                        defaultLeasePeriod = leaseTimeoutValue.longValue();
  +                        long serverDefaultLeasePeriod = leaseTimeoutValue.longValue();
  +                        if(serverDefaultLeasePeriod > 0)
  +                        {
  +                           defaultLeasePeriod = serverDefaultLeasePeriod;
  +                        }
                        }
   
                        if(isTraceEnabled)