[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejb/pluginsLRUEnterpriseContextCachePolicy.java

[jBoss CVS Development]

  User: simone  
  Date: 00/10/19 14:50:01

  Modified:    src/main/org/jboss/ejb/plugins
                        LRUEnterpriseContextCachePolicy.java
  Log:
  Min and max capacity now belongs to this class, instead of the instance cache 
implementation
  
  Revision  Changes    Path
  1.2       +27 -9     
jboss/src/main/org/jboss/ejb/plugins/LRUEnterpriseContextCachePolicy.java
  
  Index: LRUEnterpriseContextCachePolicy.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/LRUEnterpriseContextCachePolicy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LRUEnterpriseContextCachePolicy.java      2000/10/16 23:27:56     1.1
  +++ LRUEnterpriseContextCachePolicy.java      2000/10/19 21:50:00     1.2
  @@ -20,7 +20,7 @@
    *
    * @see EnterpriseInstanceCache
    * @author Simone Bordet ([EMAIL PROTECTED])
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class LRUEnterpriseContextCachePolicy extends LRUCachePolicy
        implements EnterpriseContextCachePolicy, XmlLoadable
  @@ -60,8 +60,6 @@
        {       
                if (eic == null) throw new IllegalArgumentException("Instance cache 
argument cannot be null");
                m_cache = eic;
  -             m_maxCapacity = m_cache.getMaxCapacity();
  -             m_minCapacity = m_cache.getMinCapacity();
        }
   
        // Public --------------------------------------------------------
  @@ -94,14 +92,34 @@
         */
        public void importXml(Element element) throws DeploymentException
        {
  -             String op = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "OveragerPeriod"));
  -             String rp = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "ResizerPeriod"));
  -             String ma = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "MaxBeanAge"));
  -             String map = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "MaxCacheMissPeriod"));
  -             String mip = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "MinCacheMissPeriod"));
  -             String fa = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "CacheLoadFactor"));
  +             String min = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "min-capacity"));
  +             String max = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "max-capacity"));
  +             String op = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "overager-period"));
  +             String rp = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "resizer-period"));
  +             String ma = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "max-bean-age"));
  +             String map = 
MetaData.getElementContent(MetaData.getOptionalChild(element, 
"max-cache-miss-period"));
  +             String mip = 
MetaData.getElementContent(MetaData.getOptionalChild(element, 
"min-cache-miss-period"));
  +             String fa = 
MetaData.getElementContent(MetaData.getOptionalChild(element, "cache-load-factor"));
                try 
                {
  +                     if (min != null)
  +                     {
  +                             int s = Integer.parseInt(min);
  +                             if (s <= 0) 
  +                             {
  +                                     throw new DeploymentException("Min cache 
capacity can't be <= 0");
  +                             }
  +                             m_minCapacity = s;
  +                     }
  +                     if (max != null)
  +                     {
  +                             int s = Integer.parseInt(max);
  +                             if (s <= 0)
  +                             {
  +                                     throw new DeploymentException("Max cache 
capacity can't be <= 0");
  +                             }
  +                             m_maxCapacity = s;
  +                     }                               
                        if (op != null)
                        {
                                int p = Integer.parseInt(op);