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

[Manik Surtani]

  User: msurtani
  Date: 06/07/18 06:50:45

  Modified:    src/org/jboss/cache/loader  SharedStoreCacheLoader.java
  Log:
  Checked in new Habanero interfaces
  Updated codebase to deal with new interfaces
  
  Revision  Changes    Path
  1.7       +6 -20     JBossCache/src/org/jboss/cache/loader/SharedStoreCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SharedStoreCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/SharedStoreCacheLoader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SharedStoreCacheLoader.java	8 Apr 2006 20:30:08 -0000	1.6
  +++ SharedStoreCacheLoader.java	18 Jul 2006 10:50:45 -0000	1.7
  @@ -4,7 +4,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.AbstractTreeCacheListener;
  +import org.jboss.cache.AbstractCacheListener;
   import org.jgroups.Address;
   import org.jgroups.View;
   
  @@ -20,15 +20,15 @@
    * Whenever the current coordinator dies (or leaves), the second in line will take over. That SharedStoreCacheLoader
    * will then pass writes through to its underlying CacheLoader.
    * @author Bela Ban
  - * @version $Id: SharedStoreCacheLoader.java,v 1.6 2006/04/08 20:30:08 genman Exp $
  + * @version $Id: SharedStoreCacheLoader.java,v 1.7 2006/07/18 10:50:45 msurtani Exp $
    */
  -public class SharedStoreCacheLoader extends AbstractTreeCacheListener implements CacheLoader {
  +public class SharedStoreCacheLoader extends AbstractCacheListener implements CacheLoader {
   
  -   private Log         log=LogFactory.getLog(getClass());
  +   private Log         log=LogFactory.getLog(SharedStoreCacheLoader.class);
      private CacheLoader loader=null;
      private Address     local_addr=null;
      private boolean     active=true; // only active if coordinator
  -   private TreeCache   cache=null;
  +   private TreeCache cache;
   
      public SharedStoreCacheLoader(CacheLoader loader, Address local_addr, boolean coordinator) {
         this.loader=loader;
  @@ -36,25 +36,11 @@
         this.active=coordinator;
      }
   
  -   public void nodeCreated(Fqn fqn) {}
  -   public void nodeRemoved(Fqn fqn) {}
  -   public void nodeLoaded(Fqn fqn) {}
  -   public void nodeEvicted(Fqn fqn) {}
  -   public void nodeModified(Fqn fqn) {}
  -   public void nodeVisited(Fqn fqn) {}
  -   public void cacheStarted(TreeCache cache) {}
  -   public void cacheStopped(TreeCache cache) {}
  -
      public void viewChange(View new_view) {
         boolean tmp=active;
         if(new_view != null && local_addr != null) {
            Vector mbrs=new_view.getMembers();
  -         if(mbrs != null && mbrs.size() > 0 && local_addr.equals(mbrs.firstElement())) {
  -            tmp=true;
  -         }
  -         else {
  -            tmp=false;
  -         }
  +          tmp = mbrs != null && mbrs.size() > 0 && local_addr.equals(mbrs.firstElement());
         }
         if(active != tmp) {
            active=tmp;