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

[Elias Ross]

  User: genman  
  Date: 06/11/23 14:43:05

  Modified:    src/org/jboss/cache/lock   IdentityLock.java LockMap.java
  Log:
  JIRA-867 - Fix regression in ActivationInterceptor
  
  Revision  Changes    Path
  1.16      +1 -2      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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- IdentityLock.java	20 Nov 2006 03:53:55 -0000	1.15
  +++ IdentityLock.java	23 Nov 2006 19:43:05 -0000	1.16
  @@ -61,7 +61,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 11, 2003
    * @author Ben Wang July 2003
  - * @version $Revision: 1.15 $
  + * @version $Revision: 1.16 $
    */
   public class IdentityLock implements NodeLock
   {
  @@ -513,7 +513,6 @@
      public Set acquireAll(Object caller, long timeout, LockType lock_type)
         throws LockingException, TimeoutException, InterruptedException
      {
  -      DataNode tmp;
         boolean acquired;
         Set retval = new HashSet();
   
  
  
  
  1.10      +2 -11     JBossCache/src/org/jboss/cache/lock/LockMap.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LockMap.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/LockMap.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- LockMap.java	8 Apr 2006 05:24:38 -0000	1.9
  +++ LockMap.java	23 Nov 2006 19:43:05 -0000	1.10
  @@ -6,24 +6,15 @@
    */
   package org.jboss.cache.lock;
   
  -import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
  -
  -// See IdentityLockPerfTest --
  -// oswego read/write acquire/release locks/sec: 2000000, 2840909
  -// Java   read/write acquire/release locks/sec: 2173913, 3048780
  -// about 7% improvement on single proc
  -// import java.util.concurrent.CopyOnWriteArraySet;
  -
   import java.util.Collections;
  -import java.util.Map;
  -import java.util.HashMap;
   import java.util.Set;
  +import java.util.concurrent.CopyOnWriteArraySet;
   
   /**
    * Provide lock ownership mapping.
    *
    * @author Ben Wang
  - * @version $Id: LockMap.java,v 1.9 2006/04/08 05:24:38 genman Exp $
  + * @version $Id: LockMap.java,v 1.10 2006/11/23 19:43:05 genman Exp $
    */
   public class LockMap
   {