[jboss-cvs] JBossCache/src/org/jboss/cache/eviction ...

[Manik Surtani]

  User: msurtani
  Date: 06/11/15 10:48:25

  Modified:    src/org/jboss/cache/eviction    MRUConfiguration.java
                        FIFOConfiguration.java LFUConfiguration.java
  Log:
  Fixed failures to reset configs properly
  
  Revision  Changes    Path
  1.7       +8 -2      JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MRUConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- MRUConfiguration.java	15 Nov 2006 15:16:39 -0000	1.6
  +++ MRUConfiguration.java	15 Nov 2006 15:48:25 -0000	1.7
  @@ -22,7 +22,7 @@
    * Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
    *
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class MRUConfiguration extends EvictionPolicyConfigBase
   {
  @@ -68,4 +68,10 @@
         return (obj instanceof MRUConfiguration && super.equals(obj));
      }  
      
  +   @Override
  +   public void reset()
  +   {
  +      setMaxNodes(-1);
  +   }
  +   
   }
  
  
  
  1.8       +7 -1      JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FIFOConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- FIFOConfiguration.java	15 Nov 2006 15:16:39 -0000	1.7
  +++ FIFOConfiguration.java	15 Nov 2006 15:48:25 -0000	1.8
  @@ -22,7 +22,7 @@
    * Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
    *
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class FIFOConfiguration extends EvictionPolicyConfigBase
   {
  @@ -65,4 +65,10 @@
      {
         setEvictionPolicyClass(FIFOPolicy.class.getName());
      }
  +
  +   @Override
  +   public void reset()
  +   {
  +      setMaxNodes(-1);
  +   }
   }
  
  
  
  1.8       +1 -16     JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LFUConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- LFUConfiguration.java	15 Nov 2006 15:16:39 -0000	1.7
  +++ LFUConfiguration.java	15 Nov 2006 15:48:25 -0000	1.8
  @@ -7,7 +7,6 @@
   package org.jboss.cache.eviction;
   
   import org.jboss.cache.config.Dynamic;
  -import org.jboss.cache.config.ConfigurationException;
   
   /**
    * Configuration implementation for {@link LFUPolicy}. 
  @@ -22,7 +21,7 @@
    * </pre>
    *
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class LFUConfiguration extends EvictionPolicyConfigBase
   {
  @@ -79,18 +78,4 @@
         return result;
      }
   
  -   @Override
  -   public void reset()
  -   {
  -      super.reset();
  -      setMinNodes(-1);
  -   }
  -
  -   @Override
  -   public void validate() throws ConfigurationException
  -   {
  -      if (minNodes < 0) throw new ConfigurationException("minNodes must be set");
  -   }
  -   
  -   
   }