[jboss-cvs] JBossAS SVN: r89144 - trunk/aspects/src/main/org/jboss/aspects/versioned.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 19 22:48:48 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-05-19 22:48:47 -0400 (Tue, 19 May 2009)
New Revision: 89144
Modified:
trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedListState.java
trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedMapState.java
trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedSetState.java
trunk/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
trunk/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java
Log:
JBAS-4941 - replace oswego concurrent with j.u.c
Modified: trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedListState.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedListState.java 2009-05-20 02:45:41 UTC (rev 89143)
+++ trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedListState.java 2009-05-20 02:48:47 UTC (rev 89144)
@@ -235,7 +235,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
val = versionManager.makeVersioned(val);
@@ -244,7 +244,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -257,7 +257,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
val = versionManager.makeVersioned(val);
@@ -266,7 +266,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -280,7 +280,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -294,7 +294,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -307,7 +307,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -321,7 +321,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -334,7 +334,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -342,7 +342,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -355,7 +355,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -363,7 +363,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -375,7 +375,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -383,7 +383,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -395,7 +395,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -403,7 +403,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -415,7 +415,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -423,7 +423,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -435,7 +435,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -443,7 +443,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -455,7 +455,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -463,7 +463,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -475,7 +475,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -483,7 +483,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -495,7 +495,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -503,7 +503,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -515,7 +515,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -523,7 +523,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -535,7 +535,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -543,7 +543,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -555,7 +555,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -563,7 +563,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -580,7 +580,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -588,7 +588,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -600,7 +600,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -608,7 +608,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -620,7 +620,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -628,7 +628,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -640,7 +640,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(true);
@@ -648,7 +648,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -660,7 +660,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
try
@@ -676,7 +676,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -688,7 +688,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -696,7 +696,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -708,7 +708,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -716,7 +716,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -728,7 +728,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -736,7 +736,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -748,7 +748,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
List state = getCurrentState(false);
@@ -756,7 +756,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
Modified: trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedMapState.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedMapState.java 2009-05-20 02:45:41 UTC (rev 89143)
+++ trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedMapState.java 2009-05-20 02:48:47 UTC (rev 89144)
@@ -237,7 +237,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(true);
@@ -245,7 +245,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -258,7 +258,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -266,7 +266,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -279,7 +279,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -287,7 +287,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -300,7 +300,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -308,7 +308,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -321,7 +321,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -329,7 +329,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -342,7 +342,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -350,7 +350,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -363,7 +363,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -371,7 +371,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -383,7 +383,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -391,7 +391,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -404,7 +404,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -412,7 +412,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -425,7 +425,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
val = versionManager.makeVersioned(val);
@@ -434,7 +434,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -447,7 +447,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(true);
@@ -461,7 +461,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -477,7 +477,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(true);
@@ -485,7 +485,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -498,7 +498,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -506,7 +506,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -519,7 +519,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Map state = getCurrentState(false);
@@ -527,7 +527,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
Modified: trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedSetState.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedSetState.java 2009-05-20 02:45:41 UTC (rev 89143)
+++ trunk/aspects/src/main/org/jboss/aspects/versioned/DistributedSetState.java 2009-05-20 02:48:47 UTC (rev 89144)
@@ -234,7 +234,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
val = versionManager.makeVersioned(val);
@@ -243,7 +243,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -256,7 +256,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(true);
@@ -270,7 +270,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -283,7 +283,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(true);
@@ -291,7 +291,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -304,7 +304,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -312,7 +312,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -324,7 +324,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -332,7 +332,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -344,7 +344,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -352,7 +352,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -364,7 +364,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -372,7 +372,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -384,7 +384,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -392,7 +392,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -404,7 +404,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -412,7 +412,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -424,7 +424,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(true);
@@ -432,7 +432,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -444,7 +444,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(true);
@@ -452,7 +452,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -464,7 +464,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(true);
@@ -472,7 +472,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -484,7 +484,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -492,7 +492,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -504,7 +504,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -512,7 +512,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
@@ -524,7 +524,7 @@
{
try
{
- lock.readLock().acquire();
+ lock.readLock().lock();
try
{
Set state = getCurrentState(false);
@@ -532,7 +532,7 @@
}
finally
{
- lock.readLock().release();
+ lock.readLock().unlock();
}
}
catch (Exception ex)
Modified: trunk/aspects/src/main/org/jboss/aspects/versioned/StateManager.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2009-05-20 02:45:41 UTC (rev 89143)
+++ trunk/aspects/src/main/org/jboss/aspects/versioned/StateManager.java 2009-05-20 02:48:47 UTC (rev 89144)
@@ -21,8 +21,9 @@
*/
package org.jboss.aspects.versioned;
-import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.TimeUnit;
import org.jboss.aop.InstanceAdvised;
import org.jboss.aop.util.PayloadKey;
import org.jboss.logging.Logger;
@@ -51,7 +52,7 @@
protected GUID guid;
protected long timeout;
- transient protected ReadWriteLock lock = new WriterPreferenceReadWriteLock();
+ transient protected ReadWriteLock lock = new ReentrantReadWriteLock();
public StateManager() {}
@@ -68,7 +69,7 @@
{
try
{
- if (!lock.writeLock().attempt(timeout))
+ if (!lock.writeLock().tryLock(timeout, TimeUnit.MILLISECONDS))
{
throw new LockAttemptFailure("failed to acquire write lock: " + guid);
}
@@ -76,6 +77,7 @@
}
catch (InterruptedException ignored)
{
+ Thread.currentThread().interrupt();
throw new LockAttemptFailure("failed to acquire write lock: " + guid);
}
}
@@ -84,7 +86,7 @@
{
try
{
- if (!lock.readLock().attempt(timeout))
+ if (!lock.readLock().tryLock(timeout, TimeUnit.MILLISECONDS))
{
throw new LockAttemptFailure("failed to acquire read lock: " + guid);
}
@@ -92,18 +94,19 @@
}
catch (InterruptedException ignored)
{
+ Thread.currentThread().interrupt();
throw new LockAttemptFailure("failed to acquire read lock: " + guid);
}
}
public void releaseReadLock()
{
- lock.readLock().release();
+ lock.readLock().unlock();
log.trace("readlock released for: " + guid);
}
public void releaseWriteLock()
{
- lock.writeLock().release();
+ lock.writeLock().unlock();
log.trace("writelock released for: " + guid);
}
@@ -119,7 +122,7 @@
{
this.guid = (GUID)in.readObject();
this.timeout = in.readLong();
- this.lock = new WriterPreferenceReadWriteLock();
+ this.lock = new ReentrantReadWriteLock();
}
Modified: trunk/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2009-05-20 02:45:41 UTC (rev 89143)
+++ trunk/aspects/src/main/org/jboss/aspects/versioned/VersionedObject.java 2009-05-20 02:48:47 UTC (rev 89144)
@@ -21,7 +21,7 @@
*/
package org.jboss.aspects.versioned;
-import EDU.oswego.cs.dl.util.concurrent.FIFOSemaphore;
+import java.util.concurrent.Semaphore;
import org.jboss.aop.Advised;
import org.jboss.aop.util.MarshalledValue;
import org.jboss.tm.TransactionLocal;
@@ -39,7 +39,7 @@
*/
public class VersionedObject
{
- FIFOSemaphore lock = new FIFOSemaphore(1);
+ Semaphore lock = new Semaphore(1, true);
TransactionLocal txLocal = new TransactionLocal();
long currentId = 0;
Object currentObject;
@@ -58,9 +58,9 @@
public Object createVersion(Transaction tx) throws Exception
{
+ final Object version;
+ final long versionId;
lock.acquire();
- Object version = null;
- long versionId;
try
{
version = new MarshalledValue(currentObject).get();
More information about the jboss-cvs-commits
mailing list