Author: markt
Date: Wed Jan 6 10:51:53 2010
New Revision: 896383
URL: http://svn.apache.org/viewvc?rev=896383&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48398
Objects used as locks should be final
Patches provided by sebb
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896383&r1=896382&r2=896383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 6 10:51:53 2010
@@ -103,14 +103,6 @@
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48398
- Objects used as locks should be final
- https://issues.apache.org/bugzilla/attachment.cgi?id=24714
- https://issues.apache.org/bugzilla/attachment.cgi?id=24717
- Patches provided by sebb
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
Sessions timed out too early when using PersistentManager
Port of patch by Keiichi Fujino
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=896383&r1=896382&r2=896383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Wed Jan 6 10:51:53 2010
@@ -91,7 +91,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/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=896383&r1=896382&r2=896383&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Wed Jan 6 10:51:53 2010
@@ -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);
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
if ( !okToProcess(msg.getOptions()) ) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=896383&r1=896382&r2=896383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java Wed
Jan 6 10:51:53 2010
@@ -44,7 +44,7 @@
*/
public class AntCompiler extends Compiler {
- protected static Object javacLock = new Object();
+ protected static final Object javacLock = new Object();
static {
System.setErr(new SystemLogHandler(System.err));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=896383&r1=896382&r2=896383&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 6 10:51:53 2010
@@ -37,6 +37,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>48398</bug>: Make objects used as locks final to ensure correct
+ operation. Patch provided by sebb. (markt)
+ </fix>
+ <fix>
<bug>48417</bug>: Update French translations. Patch provided by André
Warnier. (markt/kkolinko)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
