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

[Jimmy Wilson]

  User: jawilson
  Date: 07/06/24 16:53:56

  Modified:    src/org/jboss/cache/lock  Tag: Branch_JBossCache_1_4_0
                        StripedLock.java
  Log:
  Fix for [JBCACHE-1103] (backport).  Removed JDK 1.5-dependant functionality from releaseAllLocks and acquireAllLocks.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.4   +15 -4     JBossCache/src/org/jboss/cache/lock/StripedLock.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StripedLock.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/StripedLock.java,v
  retrieving revision 1.5.2.3
  retrieving revision 1.5.2.4
  diff -u -b -r1.5.2.3 -r1.5.2.4
  --- StripedLock.java	24 Jun 2007 20:28:12 -0000	1.5.2.3
  +++ StripedLock.java	24 Jun 2007 20:53:56 -0000	1.5.2.4
  @@ -5,6 +5,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   
  +import java.util.Iterator;
   import java.util.List;
   import java.util.concurrent.locks.ReentrantReadWriteLock;
   
  @@ -143,9 +144,14 @@
       * @param fqns list of fqns
       * @see #releaseLock(org.jboss.cache.Fqn)
       */
  -   public void releaseAllLocks(List<Fqn> fqns)
  +   public void releaseAllLocks(List fqns)
      {
  -      for (Fqn f : fqns) releaseLock(f);
  +      Iterator fqnsIterator = fqns.iterator();
  +
  +      while (fqnsIterator.hasNext())
  +      {
  +         releaseLock((Fqn) fqnsIterator.next());
  +      }
      }
   
      /**
  @@ -155,8 +161,13 @@
       * @param exclusive whether locks are exclusive.
       * @see #acquireLock(org.jboss.cache.Fqn,boolean)
       */
  -   public void acquireAllLocks(List<Fqn> fqns, boolean exclusive)
  +   public void acquireAllLocks(List fqns, boolean exclusive)
      {
  -      for (Fqn f : fqns) acquireLock(f, exclusive);
  +      Iterator fqnsIterator = fqns.iterator();
  +
  +      while (fqnsIterator.hasNext())
  +      {
  +         acquireLock((Fqn) fqnsIterator.next(), exclusive);
  +      }
      }
   }