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

[Manik Surtani]

  User: msurtani
  Date: 06/11/15 10:16:40

  Modified:    src/org/jboss/cache/factories   XmlConfigurationParser.java
                        InterceptorChainFactory.java
  Log:
  Updated to fix failures after patching up region managers
  
  Revision  Changes    Path
  1.7       +17 -25    JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XmlConfigurationParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- XmlConfigurationParser.java	10 Nov 2006 04:39:21 -0000	1.6
  +++ XmlConfigurationParser.java	15 Nov 2006 15:16:40 -0000	1.7
  @@ -6,31 +6,17 @@
    */
   package org.jboss.cache.factories;
   
  -import java.beans.PropertyEditor;
  -import java.beans.PropertyEditorManager;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.lang.reflect.Method;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Properties;
  -import java.util.Map.Entry;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.buddyreplication.NextMemberBuddyLocator;
   import org.jboss.cache.config.BuddyReplicationConfig;
  +import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Configuration;
   import org.jboss.cache.config.ConfigurationException;
   import org.jboss.cache.config.EvictionConfig;
   import org.jboss.cache.config.EvictionRegionConfig;
   import org.jboss.cache.config.MissingPolicyException;
  -import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
  -import org.jboss.cache.eviction.EvictionConfiguration;
   import org.jboss.cache.eviction.EvictionPolicy;
   import org.jboss.cache.eviction.EvictionPolicyConfig;
   import org.jboss.cache.util.Util;
  @@ -41,6 +27,19 @@
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   
  +import java.beans.PropertyEditor;
  +import java.beans.PropertyEditorManager;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.lang.reflect.Method;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Map.Entry;
  +import java.util.Properties;
  +
   /**
    * Reads in XMLconfiguration files and spits out a {@link org.jboss.cache.config.Configuration} object.  When deployed as a
    * JBoss MBean, this role is performed by the JBoss Microcontainer.  This class is only used internally in unit tests
  @@ -444,15 +443,7 @@
                                        policy.getEvictionConfigurationClass(), e);
          }
          
  -       if (epc instanceof EvictionConfiguration)
  -       {
  -          // Configure the old fashioned way
  -          ((EvictionConfiguration)epc).parseXMLConfig(element);
  -       }
  -       else
  -       {
             parseEvictionPolicyConfig(element, epc);
  -       }
          
          erc.setEvictionPolicyConfig(epc);
          
  @@ -461,6 +452,7 @@
       
       public static void parseEvictionPolicyConfig(Element element, EvictionPolicyConfig target)
       {
  +       target.reset();
          ParsedAttributes attributes = extractAttributes(element);
          setValues(target, attributes.stringAttribs, false);
          setValues(target, attributes.xmlAttribs, true);
  
  
  
  1.34      +2 -2      JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorChainFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- InterceptorChainFactory.java	10 Nov 2006 02:48:46 -0000	1.33
  +++ InterceptorChainFactory.java	15 Nov 2006 15:16:40 -0000	1.34
  @@ -358,7 +358,7 @@
            addInterceptor(first, lock_interceptor);
         }
   
  -      if (treeCache.isUsingEviction())
  +      if (treeCache.getConfiguration().getEvictionConfig() != null && treeCache.getConfiguration().getEvictionConfig().isValidConfig())
         {
            eviction_interceptor = createInterceptor(treeCache.getEvictionInterceptorClass(), cache);
            if (first == null)
  @@ -445,7 +445,7 @@
         invokerInterceptor = createInterceptor(CallInterceptor.class, cache);
         ((CallInterceptor) invokerInterceptor).setTreeCacheInstance(treeCache);
   
  -      if (treeCache.isUsingEviction())
  +      if (treeCache.getConfiguration().getEvictionConfig() != null && treeCache.getConfiguration().getEvictionConfig().isValidConfig())
         {
            evictionInterceptor = createInterceptor(treeCache.getEvictionInterceptorClass(), cache);
         }