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

[Manik Surtani]

  User: msurtani
  Date: 06/12/30 21:08:40

  Modified:    src/org/jboss/cache/lock  IdentityLock.java
  Log:
  Updates to tests to go along with changes in node methods
  
  Revision  Changes    Path
  1.18      +15 -13    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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- IdentityLock.java	8 Dec 2006 18:50:49 -0000	1.17
  +++ IdentityLock.java	31 Dec 2006 02:08:40 -0000	1.18
  @@ -6,8 +6,6 @@
    */
   package org.jboss.cache.lock;
   
  -import java.util.concurrent.TimeUnit;
  -import java.util.concurrent.locks.Lock;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
  @@ -18,6 +16,8 @@
   import java.util.HashSet;
   import java.util.Iterator;
   import java.util.Set;
  +import java.util.concurrent.TimeUnit;
  +import java.util.concurrent.locks.Lock;
   
   /**
    * Lock object which grants and releases locks, and associates locks with
  @@ -58,7 +58,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 11, 2003
    * @author Ben Wang July 2003
  - * @version $Revision: 1.17 $
  + * @version $Revision: 1.18 $
    */
   public class IdentityLock implements NodeLock
   {
  @@ -169,7 +169,8 @@
         return flag;
      }
      
  -   private boolean acquireWriteLock0(Object caller, long timeout) throws LockingException, TimeoutException, InterruptedException {
  +   private boolean acquireWriteLock0(Object caller, long timeout) throws LockingException, TimeoutException, InterruptedException
  +   {
         if (caller == null)
         {
            throw new IllegalArgumentException("acquireWriteLock(): null caller");
  @@ -532,7 +533,8 @@
      
      public void releaseAll(Object owner)
      {
  -      for (Node n: node.getChildren()) {
  +      for (Node n : node.getChildren())
  +      {
            n.getNodeSPI().getLock().releaseAll(owner);
         }
         release(owner);
  @@ -554,7 +556,7 @@
         boolean locked = isLocked();
   
         printIndent(sb, indent);
  -      sb.append(Fqn.SEPARATOR).append(node.getFqn().getLast());
  +      sb.append(Fqn.SEPARATOR).append(node.getFqn().getLastElement());
         if (locked)
         {
            sb.append("\t(");