[jboss-cvs] JBossCache/src/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Wed Nov 15 10:16:39 EST 2006
User: msurtani
Date: 06/11/15 10:16:39
Modified: src/org/jboss/cache/eviction LRUConfiguration.java
MRUConfiguration.java EvictionPolicyConfigBase.java
FIFOConfiguration.java
ElementSizeConfiguration.java
EvictionPolicyConfig.java LFUConfiguration.java
Log:
Updated to fix failures after patching up region managers
Revision Changes Path
1.5 +16 -3 JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LRUConfiguration.java 27 Oct 2006 19:26:07 -0000 1.4
+++ LRUConfiguration.java 15 Nov 2006 15:16:39 -0000 1.5
@@ -23,7 +23,7 @@
* </pre>
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class LRUConfiguration extends EvictionPolicyConfigBase
{
@@ -37,11 +37,18 @@
public LRUConfiguration()
{
- setEvictionPolicyClass(LRUPolicy.class.getName());
+ setEvictionPolicyClassName();
// Force config of ttls
setTimeToLiveSeconds(-1);
}
+ @Override
+ protected void setEvictionPolicyClassName()
+ {
+ setEvictionPolicyClass(LRUPolicy.class.getName());
+ }
+
+
public int getTimeToLiveSeconds()
{
return timeToLiveSeconds;
@@ -104,5 +111,11 @@
return result;
}
+ @Override
+ public void reset()
+ {
+ super.reset();
+ setTimeToLiveSeconds(-1);
+ }
}
1.6 +10 -3 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MRUConfiguration.java 27 Oct 2006 19:26:07 -0000 1.5
+++ MRUConfiguration.java 15 Nov 2006 15:16:39 -0000 1.6
@@ -22,7 +22,7 @@
* Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class MRUConfiguration extends EvictionPolicyConfigBase
{
@@ -31,11 +31,18 @@
public MRUConfiguration()
{
- setEvictionPolicyClass(MRUPolicy.class.getName());
+ setEvictionPolicyClassName();
// We require that maxNodes is set
setMaxNodes(-1);
}
+ @Override
+ protected void setEvictionPolicyClassName()
+ {
+ setEvictionPolicyClass(MRUPolicy.class.getName());
+ }
+
+
/**
* Requires a positive maxNodes value or ConfigurationException
* is thrown.
1.2 +12 -1 JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfigBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionPolicyConfigBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfigBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- EvictionPolicyConfigBase.java 27 Oct 2006 19:26:07 -0000 1.1
+++ EvictionPolicyConfigBase.java 15 Nov 2006 15:16:39 -0000 1.2
@@ -80,6 +80,17 @@
return result;
}
+ public void reset()
+ {
+ setEvictionPolicyClass(null);
+ setMaxNodes(0);
+ setEvictionPolicyClassName();
+ }
-
+ /**
+ * This method allows implementers a chance to set the policy class name.
+ * This should be called when the implementation is constructed, but is also
+ * called in {@link #reset()}
+ */
+ abstract protected void setEvictionPolicyClassName();
}
1.7 +7 -3 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- FIFOConfiguration.java 27 Oct 2006 19:26:07 -0000 1.6
+++ FIFOConfiguration.java 15 Nov 2006 15:16:39 -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 FIFOConfiguration extends EvictionPolicyConfigBase
{
@@ -31,7 +31,7 @@
public FIFOConfiguration()
{
- setEvictionPolicyClass(FIFOPolicy.class.getName());
+ setEvictionPolicyClassName();
// We require that maxNodes is set
setMaxNodes(-1);
}
@@ -60,5 +60,9 @@
return (obj instanceof FIFOConfiguration && super.equals(obj));
}
-
+ @Override
+ protected void setEvictionPolicyClassName()
+ {
+ setEvictionPolicyClass(FIFOPolicy.class.getName());
+ }
}
1.5 +16 -6 JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ElementSizeConfiguration.java 27 Oct 2006 19:26:07 -0000 1.4
+++ ElementSizeConfiguration.java 15 Nov 2006 15:16:39 -0000 1.5
@@ -26,7 +26,7 @@
* @author Daniel Huang
* @author Brian Stansberry
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class ElementSizeConfiguration extends EvictionPolicyConfigBase
{
@@ -38,11 +38,17 @@
public ElementSizeConfiguration()
{
- setEvictionPolicyClass(ElementSizePolicy.class.getName());
+ setEvictionPolicyClassName();
// Force configuration of maxElementsPerNode
setMaxElementsPerNode(-1);
}
+ @Override
+ protected void setEvictionPolicyClassName()
+ {
+ setEvictionPolicyClass(ElementSizePolicy.class.getName());
+ }
+
public int getMaxElementsPerNode()
{
return maxElementsPerNode;
@@ -61,8 +67,7 @@
@Override
public void validate() throws ConfigurationException
{
- if (maxElementsPerNode < 0)
- throw new ConfigurationException("maxElementsPerNode must be configured");
+ if (maxElementsPerNode < 0) throw new ConfigurationException("maxElementsPerNode must be configured");
}
public String toString()
@@ -93,5 +98,10 @@
return result;
}
-
+ @Override
+ public void reset()
+ {
+ super.reset();
+ setMaxElementsPerNode(-1);
+ }
}
1.6 +7 -2 JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfig.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionPolicyConfig.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- EvictionPolicyConfig.java 14 Nov 2006 14:17:11 -0000 1.5
+++ EvictionPolicyConfig.java 15 Nov 2006 15:16:39 -0000 1.6
@@ -26,7 +26,7 @@
*
* @return fully qualified class name
*/
- public String getEvictionPolicyClass();
+ String getEvictionPolicyClass();
/**
* Validate the configuration. Will be called after any configuration
@@ -35,5 +35,10 @@
* @throws ConfigurationException if any values for the configuration
* properties are invalid
*/
- public void validate() throws ConfigurationException;
+ void validate() throws ConfigurationException;
+
+ /**
+ * Resets the values to their defaults.
+ */
+ void reset();
}
1.7 +22 -2 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LFUConfiguration.java 27 Oct 2006 19:26:07 -0000 1.6
+++ LFUConfiguration.java 15 Nov 2006 15:16:39 -0000 1.7
@@ -7,6 +7,7 @@
package org.jboss.cache.eviction;
import org.jboss.cache.config.Dynamic;
+import org.jboss.cache.config.ConfigurationException;
/**
* Configuration implementation for {@link LFUPolicy}.
@@ -21,7 +22,7 @@
* </pre>
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class LFUConfiguration extends EvictionPolicyConfigBase
{
@@ -33,6 +34,12 @@
public LFUConfiguration()
{
+ setEvictionPolicyClassName();
+ }
+
+ @Override
+ protected void setEvictionPolicyClassName()
+ {
setEvictionPolicyClass(LFUPolicy.class.getName());
}
@@ -72,5 +79,18 @@
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");
+ }
+
}
More information about the jboss-cvs-commits
mailing list