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

[Manik Surtani]

  User: msurtani
  Date: 06/08/08 11:50:50

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  JBCACHE-725
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.6 +11 -14    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.195.2.5
  retrieving revision 1.195.2.6
  diff -u -b -r1.195.2.5 -r1.195.2.6
  --- TreeCache.java	8 Aug 2006 12:21:22 -0000	1.195.2.5
  +++ TreeCache.java	8 Aug 2006 15:50:49 -0000	1.195.2.6
  @@ -79,7 +79,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.195.2.5 2006/08/08 12:21:22 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.6 2006/08/08 15:50:49 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -714,7 +714,7 @@
      public void setEvictionPolicyConfig(Element config)
      {
         evictConfig_ = config;
  -      log.info("setEvictionPolicyConfig(): " + config);
  +      if (log.isDebugEnabled()) log.debug("setEvictionPolicyConfig(): " + config);
      }
   
      /**
  @@ -780,7 +780,7 @@
         // Remove the trailing ':'
         buffer.setLength(buffer.length() - 1);
         setClusterProperties(buffer.toString());
  -      log.info("setting cluster properties from xml to: " + cluster_props);
  +      if (log.isDebugEnabled()) log.debug("setting cluster properties from xml to: " + cluster_props);
      }
   
   
  @@ -1232,9 +1232,9 @@
            throw new ChannelNotConnectedException();
         boolean rc = channel.getState(null, timeout);
         if (rc)
  -         log.info("fetchState(): state was retrieved successfully");
  +         if (log.isDebugEnabled()) log.debug("fetchState(): state was retrieved successfully");
         else
  -         log.info("fetchState(): state could not be retrieved (first member)");
  +         if (log.isDebugEnabled()) log.debug("fetchState(): state could not be retrieved (first member)");
      }
   
      /**
  @@ -1339,13 +1339,13 @@
         switch (cache_mode)
         {
            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 " + mode2String(cache_mode));
  +            log.debug("cache mode is " + mode2String(cache_mode));
               if (channel != null)
               { // already started
                  log.info("channel is already running");
  @@ -1369,8 +1369,6 @@
                  }
                  channel = new JChannel(cluster_props);
                  channel.setOpt(Channel.GET_STATE_EVENTS, Boolean.TRUE);
  -               if (log.isTraceEnabled())
  -                  log.trace("cache properties: " + cluster_props);
               }
               channel.setOpt(Channel.AUTO_RECONNECT, Boolean.TRUE);
               channel.setOpt(Channel.AUTO_GETSTATE, Boolean.TRUE);
  @@ -1422,8 +1420,7 @@
            case INVALIDATION_SYNC:
               channel.connect(cluster_name);
   
  -            if (log.isInfoEnabled())
  -               log.info("TreeCache local address is " + channel.getLocalAddress());
  +            if (log.isInfoEnabled()) log.info("TreeCache local address is " + channel.getLocalAddress());
               if (getFetchStateOnStartup())
               {
                  fetchStateOnStartup();
  @@ -1582,7 +1579,7 @@
         else
         {
            this.usingEviction = false;
  -         log.info("Not using an EvictionPolicy");
  +         log.debug("Not using an EvictionPolicy");
         }
      }
   
  @@ -5298,7 +5295,7 @@
            {
   
               if (new_state == null)
  -               my_log.info("transferred state is null (may be first member in cluster)");
  +               if (my_log.isDebugEnabled()) my_log.debug("transferred state is null (may be first member in cluster)");
               else
                  TreeCache.this._setState(new_state, root, null);
   
  @@ -5336,7 +5333,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;