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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 13:26:06

  Modified:    src/org/jboss/cache   CacheImpl.java UnversionedNode.java
  Log:
  Cleaned up cache factory
  
  Revision  Changes    Path
  1.9       +4 -12     JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- CacheImpl.java	2 Jan 2007 17:15:29 -0000	1.8
  +++ CacheImpl.java	2 Jan 2007 18:26:06 -0000	1.9
  @@ -98,7 +98,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: CacheImpl.java,v 1.8 2007/01/02 17:15:29 msurtani Exp $
  + * @version $Id: CacheImpl.java,v 1.9 2007/01/02 18:26:06 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -790,7 +790,6 @@
         }
   
         // Find out if we are coordinator (blocks until view is received)
  -      // TODO should this be moved above the buddy manager code??
         determineCoordinator();
   
         // start any eviction threads.
  @@ -3035,8 +3034,6 @@
         log.warn("method _lock() should not be invoked on CacheImpl");
      }
   
  -   // todo: these methods can be removed once we move 2PC entirely into {Replication/Lock}Interceptor
  -
      /**
       * Throws UnsupportedOperationException.
       */
  @@ -3056,7 +3053,7 @@
      /**
       * Throws UnsupportedOperationException.
       */
  -   public void commit(GlobalTransaction tx)//, Boolean hasMods)
  +   public void commit(GlobalTransaction tx)
      {
         throw new UnsupportedOperationException("commit() should not be called on CacheImpl directly");
      }
  @@ -3549,12 +3546,7 @@
      public void viewAccepted(View new_view)
      {
         Vector new_mbrs = new_view.getMembers();
  -
  -      // todo: if MergeView, fetch and reconcile state from coordinator
  -      // actually maybe this is best left up to the application ? we just notify them and let
  -      // the appl handle it ?
  -
  -      log.info("viewAccepted(): " + new_view);
  +      if (log.isInfoEnabled()) log.info("viewAccepted(): " + new_view);
         synchronized (members)
         {
            boolean needNotification = false;
  @@ -3573,7 +3565,7 @@
            }
   
            // Now that we have a view, figure out if we are the coordinator
  -         coordinator = (members.size() == 0 ? false : members.get(0).equals(getLocalAddress()));
  +         coordinator = (members.size() != 0 && members.get(0).equals(getLocalAddress()));
   
            // now notify listeners - *after* updating the coordinator. - JBCACHE-662
            if (needNotification) notifier.notifyViewChange(new_view);
  
  
  
  1.6       +0 -1      JBossCache/src/org/jboss/cache/UnversionedNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnversionedNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/UnversionedNode.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UnversionedNode.java	2 Jan 2007 17:15:29 -0000	1.5
  +++ UnversionedNode.java	2 Jan 2007 18:26:06 -0000	1.6
  @@ -288,7 +288,6 @@
         }
         else
         {
  -         // TODO add erase option to Cache (?)
            if (erase)
            {
               ((CacheImpl) cache).removeData(fqn);