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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 04:29:18

  Modified:    src/org/jboss/cache/loader/jdbm  JdbmCacheLoader.java
  Log:
  Migration to new CacheLoader interface
  
  Revision  Changes    Path
  1.10      +10 -11    JBossCache/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JdbmCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- JdbmCacheLoader.java	24 May 2006 05:47:27 -0000	1.9
  +++ JdbmCacheLoader.java	19 Jul 2006 08:29:18 -0000	1.10
  @@ -10,9 +10,9 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Modification;
  -import org.jboss.cache.TreeCache;
  +import org.jboss.cache.CacheSPI;
   import org.jboss.cache.buddyreplication.BuddyManager;
  -import org.jboss.cache.loader.ExtendedCacheLoader;
  +import org.jboss.cache.loader.AbstractCacheLoader;
   import org.jboss.cache.marshall.RegionManager;
   import org.jboss.cache.optimistic.FqnComparator;
   
  @@ -54,10 +54,10 @@
    * plans to fix this.
    *
    * @author Elias Ross
  - * @version $Id: JdbmCacheLoader.java,v 1.9 2006/05/24 05:47:27 bstansberry Exp $
  + * @version $Id: JdbmCacheLoader.java,v 1.10 2006/07/19 08:29:18 msurtani Exp $
    */
  -public class JdbmCacheLoader implements ExtendedCacheLoader {
  -
  +public class JdbmCacheLoader extends AbstractCacheLoader
  +{
      private static final Log log = LogFactory.getLog(JdbmCacheLoader.class); 
   
      private static final String KEYS = "K";
  @@ -65,7 +65,6 @@
      private static final String NAME = "JdbmCacheLoader";
   
      private String locationStr;
  -   private TreeCache treeCache;
      private String cacheDbName;
      private RecordManager recman;
      private BTree tree;
  @@ -93,7 +92,7 @@
   
         log.trace("Starting JdbmCacheLoader instance.");
         checkNotOpen();
  -      checkNonNull(treeCache, "TreeCache object is required");
  +      checkNonNull(cache, "CacheSPI object is required");
   
         if (locationStr == null) {
            locationStr=System.getProperty("java.io.tmpdir");
  @@ -118,7 +117,7 @@
            cacheDbName = locationStr.substring(offset + 1);
         } else {
            homeDir = new File(locationStr);
  -         cacheDbName = treeCache.getClusterName();
  +         cacheDbName = cache.getClusterName();
         }
   
         try {
  @@ -192,9 +191,9 @@
      /**
       * Sets the TreeCache owner of this cache loader.
       */
  -   public void setCache(TreeCache c) {
  +   public void setCache(CacheSPI c) {
  +      super.setCache(c);
         checkNotOpen();
  -      treeCache = c;
      }
   
      /**
  @@ -625,7 +624,7 @@
               subtree.isChildOf(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN) && subtree.size() > 1;
      
            // store new state
  -         Fqn storeFqn = null;         
  +         Fqn storeFqn;
            while (bais.available() > 0) {
               Fqn fqn = (Fqn)ois.readObject();