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

[Brian Stansberry]

  User: bstansberry
  Date: 07/01/29 10:37:11

  Modified:    src/org/jboss/cache/lock  IdentityLock.java
  Log:
  [JBCACHE-951] Reduce log severity when we end up including the log content in an exception message
  
  Revision  Changes    Path
  1.20      +7 -6      JBossCache/src/org/jboss/cache/lock/IdentityLock.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IdentityLock.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/IdentityLock.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- IdentityLock.java	4 Jan 2007 05:35:40 -0000	1.19
  +++ IdentityLock.java	29 Jan 2007 15:37:11 -0000	1.20
  @@ -59,7 +59,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 11, 2003
    * @author Ben Wang July 2003
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public class IdentityLock implements NodeLock
   {
  @@ -204,7 +204,7 @@
            catch (UpgradeException ue)
            {
               String errStr = "acquireWriteLock(): lock upgrade failed for " + getFqn() + " (caller=" + caller + ')';
  -            log.error(errStr, ue);
  +            log.debug(errStr, ue);
               throw new UpgradeException(errStr, ue);
            }
            if (wLock == null)
  @@ -213,7 +213,7 @@
               map_.removeReader(caller);
               String errStr = "upgrade lock for " + getFqn() + " could not be acquired after " + timeout + " ms." +
                       " Lock map ownership " + map_.printInfo() + " (caller=" + caller + ')';
  -            log.error(errStr);
  +            log.debug(errStr);
               throw new UpgradeException(errStr);
            }
            try
  @@ -239,7 +239,7 @@
            {
               String errStr = "write lock for " + getFqn() + " could not be acquired after " + timeout + " ms. " +
                       "Locks: " + map_.printInfo() + " (caller=" + caller + ", lock info: " + toString(true) + ')';
  -            log.error(errStr);
  +            log.debug(errStr);
               throw new TimeoutException(errStr);
            }
            map_.setWriterIfNotNull(caller);
  @@ -317,8 +317,9 @@
            sb.append("read lock for ").append(getFqn()).append(" could not be acquired by ").append(caller);
            sb.append(" after ").append(timeout).append(" ms. " + "Locks: ").append(map_.printInfo());
            sb.append(", lock info: ").append(toString(true));
  -         log.error(sb.toString());
  -         throw new TimeoutException(sb.toString());
  +         String errMsg = sb.toString();
  +         log.debug(errMsg);
  +         throw new TimeoutException(errMsg);
         }
   
         // Only add to the map if we didn't already have the lock