Author: markt
Date: Sun Dec 20 03:46:02 2009
New Revision: 892558
URL: http://svn.apache.org/viewvc?rev=892558&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48399
Make locks final
Patch by sebb
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=892558&r1=892557&r2=892558&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sun Dec
20 03:46:02 2009
@@ -92,7 +92,7 @@
private transient long lastTimeReplicated = System.currentTimeMillis();
- protected Lock diffLock = new ReentrantReadWriteLock().writeLock();
+ protected final Lock diffLock = new ReentrantReadWriteLock().writeLock();
private long version;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=892558&r1=892557&r2=892558&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Sun Dec 20 03:46:02 2009
@@ -61,8 +61,8 @@
private boolean forwardExpired = true;
private int maxQueue = Integer.MAX_VALUE;
- ReentrantReadWriteLock inLock = new ReentrantReadWriteLock(true);
- ReentrantReadWriteLock outLock= new ReentrantReadWriteLock(true);
+ final ReentrantReadWriteLock inLock = new ReentrantReadWriteLock(true);
+ final ReentrantReadWriteLock outLock= new ReentrantReadWriteLock(true);
@Override
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java?rev=892558&r1=892557&r2=892558&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
Sun Dec 20 03:46:02 2009
@@ -65,7 +65,7 @@
* per-thread-locks for the waiting phase we have
* a phase one lock during the contention period.
*/
- final ReentrantLock[] locks = new ReentrantLock[LOCK_COUNT];
+ private final ReentrantLock[] locks = new ReentrantLock[LOCK_COUNT];
/**
* All the objects in the pool are stored in a simple linked list
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
