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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:43

  Modified:    src/org/jboss/cache/eviction  RegionManager.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.19      +5 -5      JBossCache/src/org/jboss/cache/eviction/RegionManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegionManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/RegionManager.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- RegionManager.java	18 Jul 2006 17:50:56 -0000	1.18
  +++ RegionManager.java	19 Jul 2006 21:34:43 -0000	1.19
  @@ -34,7 +34,7 @@
    *
    * @author Ben Wang 02-2004
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: RegionManager.java,v 1.18 2006/07/18 17:50:56 msurtani Exp $
  + * @version $Id: RegionManager.java,v 1.19 2006/07/19 21:34:43 msurtani Exp $
    */
   public class RegionManager
   {
  @@ -164,14 +164,14 @@
         cache_ = cache;
   
         // done for API 1.2 backwards compatibility for EJB3 integration.
  -      String evictionClass = cache_.getEvictionPolicyClass();
  +      String evictionClass = cache_.getConfiguration().getEvictionPolicyClass();
         if (evictionClass != null && evictionClass.length() != 0)
         {
            try
            {
               policy_ = (EvictionPolicy) loadClass(evictionClass).newInstance();
               policy_.configure(cache_);
  -            cache_.setEvictionPolicyProvider(policy_);
  +            //cache_.setEvictionPolicyProvider(policy_);
            }
            catch (Exception e)
            {
  @@ -182,7 +182,7 @@
         EvictionTreeCacheListener listener = new EvictionTreeCacheListener();
         cache_.setEvictionListener(listener);
   
  -      Element elem = cache_.getEvictionPolicyConfig();
  +      Element elem = cache_.getConfiguration().getEvictionPolicyConfig();
         String temp = XmlHelper.getTagContents(elem,
               EvictionConfiguration.WAKEUP_INTERVAL_SECONDS, EvictionConfiguration.ATTR, EvictionConfiguration.NAME);
   
  @@ -399,7 +399,7 @@
         String evictionClass = regionConfig.getAttribute(EvictionConfiguration.REGION_POLICY_CLASS);
         if (evictionClass == null || evictionClass.length() == 0)
         {
  -         evictionClass = cache_.getEvictionPolicyClass();
  +         evictionClass = cache_.getConfiguration().getEvictionPolicyClass();
            // if it's still null... what do we configure?
            if (evictionClass == null || evictionClass.length() == 0)
            {