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

[Manik Surtani]

  User: msurtani
  Date: 06/08/09 10:50:00

  Modified:    src/org/jboss/cache   TreeCache.java TreeCacheProxyImpl.java
  Log:
  Merged in fixes from 1.4.0.SP1
  
  Revision  Changes    Path
  1.209     +12 -12    JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.208
  retrieving revision 1.209
  diff -u -b -r1.208 -r1.209
  --- TreeCache.java	20 Jul 2006 21:58:21 -0000	1.208
  +++ TreeCache.java	9 Aug 2006 14:50:00 -0000	1.209
  @@ -73,7 +73,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: TreeCache.java,v 1.208 2006/07/20 21:58:21 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.209 2006/08/09 14:50:00 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -570,9 +570,9 @@
            throw new ChannelNotConnectedException();
         boolean rc = channel.getState(null, timeout);
         if (rc)
  -         log.info("fetchState(): state was retrieved successfully");
  +         log.debug("fetchState(): state was retrieved successfully");
         else
  -         log.info("fetchState(): state could not be retrieved (first member)");
  +         log.debug("fetchState(): state could not be retrieved (first member)");
      }
   
      /**
  @@ -681,13 +681,13 @@
         switch (configuration.getCacheMode())
         {
            case LOCAL:
  -            log.info("cache mode is local, will not create the channel");
  +            log.debug("cache mode is local, will not create the channel");
               break;
            case REPL_SYNC:
            case REPL_ASYNC:
            case INVALIDATION_ASYNC:
            case INVALIDATION_SYNC:
  -            log.info("cache mode is " + configuration.getCacheMode());
  +            if (log.isDebugEnabled()) log.debug("cache mode is " + configuration.getCacheMode());
               if (channel != null)
               { // already started
                  log.info("channel is already running");
  @@ -699,7 +699,7 @@
               }
               if (channel != null)
               { // mux channel
  -               log.info("Created Multiplexer Channel for cache cluster " + configuration.getClusterName() +
  +               if (log.isDebugEnabled()) log.debug("Created Multiplexer Channel for cache cluster " + configuration.getClusterName() +
                        " using stack " + getMultiplexerStack());
               }
               else
  @@ -918,7 +918,7 @@
         else
         {
            this.usingEviction = false;
  -         log.info("Not using an EvictionPolicy");
  +         log.debug("Not using an EvictionPolicy");
         }
      }
   
  @@ -1623,7 +1623,7 @@
               }
            }
            stop = System.currentTimeMillis();
  -         log.info("state was retrieved successfully (in " + (stop - start) + " milliseconds)");
  +         if (log.isDebugEnabled()) log.debug("state was retrieved successfully (in " + (stop - start) + " milliseconds)");
         }
         else
         {
  @@ -1648,7 +1648,7 @@
   
            if (isCoordinator())
            {
  -            log.info("State could not be retrieved (we are the first member in group)");
  +            log.debug("State could not be retrieved (we are the first member in group)");
            }
            else
            {
  @@ -3711,7 +3711,7 @@
            {
   
               if (new_state == null)
  -               my_log.info("transferred state is null (may be first member in cluster)");
  +               my_log.debug("transferred state is null (may be first member in cluster)");
               else
                  getStateTransferManager().setState(new_state, Fqn.ROOT, null);
   
  @@ -3749,7 +3749,7 @@
         // 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.isDebugEnabled()) log.debug("viewAccepted(): " + new_view);
         synchronized (members)
         {
            boolean needNotification = false;
  @@ -4259,7 +4259,7 @@
         }
      }
   
  -    protected CacheSPI getCacheSPI()
  +    public CacheSPI getCacheSPI()
       {
           throw new UnsupportedOperationException("IMPLEMENT ME!!");
       }
  
  
  
  1.6       +2 -1      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- TreeCacheProxyImpl.java	20 Jul 2006 21:58:21 -0000	1.5
  +++ TreeCacheProxyImpl.java	9 Aug 2006 14:50:00 -0000	1.6
  @@ -391,7 +391,8 @@
       // TODO: Figure out how we deal with these:
       public DataNode peek(Fqn fqn)
       {
  -        throw new RuntimeException("TODO: Need to figure out how to deal with these.");
  +        return treeCache.peek(fqn);
  +        //throw new RuntimeException("TODO: Need to figure out how to deal with these.");
       }
   
       public void _evict(Fqn fqn)