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

[Manik Surtani]

  User: msurtani
  Date: 07/01/17 12:21:37

  Modified:    src/org/jboss/cache  RegionManager.java
  Log:
  Removed unused Marshaller methods
  
  Revision  Changes    Path
  1.24      +15 -6     JBossCache/src/org/jboss/cache/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/RegionManager.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- RegionManager.java	17 Jan 2007 01:31:06 -0000	1.23
  +++ RegionManager.java	17 Jan 2007 17:21:37 -0000	1.24
  @@ -9,7 +9,6 @@
   import org.jboss.cache.eviction.EvictionTimerTask;
   import org.jboss.cache.eviction.RegionNameConflictException;
   import org.jboss.cache.lock.NodeLock;
  -import org.jboss.cache.marshall.Marshaller;
   import org.jgroups.Address;
   
   import java.util.ArrayList;
  @@ -19,7 +18,6 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import java.util.Vector;
   import java.util.concurrent.ConcurrentHashMap;
   
   /**
  @@ -452,6 +450,19 @@
      }
   
      /**
  +    * Convenienve method.  If the region defined by fqn does not exist, {@link #isDefaultInactive()} is returned.
  +    *
  +    * @param fqn fqn to test
  +    * @return true if inactive
  +    */
  +   public boolean isInactive(String fqn)
  +   {
  +      Region region = getRegion(Fqn.fromString(fqn), false);
  +      return region == null ? defaultInactive : !region.isActive();
  +   }
  +
  +
  +   /**
       * Causes the cache to stop accepting replication events for the subtree
       * rooted at <code>subtreeFqn</code> and evict all nodes in that subtree.
       *
  @@ -485,9 +496,7 @@
            // Record that this fqn is in status change, so can't provide state
            activationChangeNodes.add(fqn);
   
  -         Marshaller marshaller = cache.getMarshaller();
  -         boolean inactive = marshaller.isInactive(subtreeFqn);
  -         if (!inactive)
  +         if (!isInactive(subtreeFqn))
            {
               deactivate(subtreeFqn);
            }