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

[Brian Stansberry]

  User: bstansberry
  Date: 06/08/11 15:59:14

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  Fix broken nesting of if statements
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.8 +12 -6     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.7
  retrieving revision 1.195.2.8
  diff -u -b -r1.195.2.7 -r1.195.2.8
  --- TreeCache.java	11 Aug 2006 16:36:42 -0000	1.195.2.7
  +++ TreeCache.java	11 Aug 2006 19:59:14 -0000	1.195.2.8
  @@ -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.7 2006/08/11 16:36:42 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.8 2006/08/11 19:59:14 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -1231,10 +1231,13 @@
         if (channel == null)
            throw new ChannelNotConnectedException();
         boolean rc = channel.getState(null, timeout);
  +      if (log.isDebugEnabled())
  +      {
         if (rc)
  -         if (log.isDebugEnabled()) log.debug("fetchState(): state was retrieved successfully");
  +            log.debug("fetchState(): state was retrieved successfully");
         else
  -         if (log.isDebugEnabled()) log.debug("fetchState(): state could not be retrieved (first member)");
  +            log.debug("fetchState(): state could not be retrieved (first member)");
  +      }
      }
   
      /**
  @@ -2508,7 +2511,8 @@
         {
            if (fetchTransientState || fetchPersistentState)
            {
  -            log.info("locking the " + fqn + " subtree to return the in-memory (transient) state");
  +            if (log.isDebugEnabled()) 
  +               log.info("locking the subtree at " + fqn + " to transfer state");
               acquireLocksForStateTransfer(rootNode, owner, timeout, true, force);
            }
   
  @@ -5295,7 +5299,9 @@
            {
   
               if (new_state == null)
  +            {
                  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);