[pkg-java] r4648 - trunk/jbossas4/debian/patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-06 21:33:52 +0000 (Tue, 06 Nov 2007)
New Revision: 4648

Modified:
   trunk/jbossas4/debian/patches/concurrent.diff
Log:
replace isLocked() by getHoldCount() in concurrent.diff


Modified: trunk/jbossas4/debian/patches/concurrent.diff
===================================================================
--- trunk/jbossas4/debian/patches/concurrent.diff	2007-11-06 21:19:26 UTC (rev 4647)
+++ trunk/jbossas4/debian/patches/concurrent.diff	2007-11-06 21:33:52 UTC (rev 4648)
@@ -322,7 +322,7 @@
           Thread t = Thread.currentThread();
           // Register this thread as owning this UCL
 -         if( loadLock.holds() == 1 )
-+         if( loadLock.isLocked() )
++         if( loadLock.getHoldCount() == 1 )
              LoadMgr3.registerLoaderThread(this, t);
  
           // Create a class loading task and submit it to the repository
@@ -331,7 +331,7 @@
        {
           // Unregister as the UCL owner to reschedule any remaining load tasks
 -         if( loadLock.holds() == 1 )
-+         if( loadLock.isLocked() )
++         if( loadLock.getHoldCount() == 1 )
              LoadMgr3.endLoadTask(task);
           // Notify any threads waiting to use this UCL
           this.release();
@@ -349,7 +349,7 @@
        }
        if( trace )
 -         log.trace("attempt("+loadLock.holds()+") was: "+acquired+" for :"+this);
-+         log.trace("attempt("+loadLock.isLocked()+") was: "+acquired+" for :"+this);
++         log.trace("attempt("+loadLock.getHoldCount()+") was: "+acquired+" for :"+this);
        return acquired;
     }
     
@@ -370,7 +370,7 @@
        }
        if( log.isTraceEnabled() )
 -         log.trace("acquired("+loadLock.holds()+") for :"+this);
-+         log.trace("acquired("+loadLock.isLocked()+") for :"+this);
++         log.trace("acquired("+loadLock.getHoldCount()+") for :"+this);
     }
     /** Release the class loading lock previous acquired through the acquire
      * method.
@@ -380,11 +380,11 @@
        if( log.isTraceEnabled() )
 -         log.trace("release("+loadLock.holds()+") for :"+this);
 -      loadLock.release();
-+         log.trace("release("+loadLock.isLocked()+") for :"+this);
++         log.trace("release("+loadLock.getHoldCount()+") for :"+this);
 +      loadLock.unlock();
        if( log.isTraceEnabled() )
 -         log.trace("released, holds: "+loadLock.holds());
-+         log.trace("released, holds: "+loadLock.isLocked());
++         log.trace("released, holds: "+loadLock.getHoldCount());
     }
  
     /** Obtain the bytecode for the indicated class from this class loaders