Author: rjung Date: Thu Apr 15 20:08:58 2010 New Revision: 934577 URL: http://svn.apache.org/viewvc?rev=934577&view=rev Log: Fix BZ48398: Objects used as locks should be final. Patches provided by sebb.
Backport of r896383 from TC 6.0.x. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=934577&r1=934576&r2=934577&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Thu Apr 15 20:08:58 2010 @@ -32,6 +32,11 @@ <section name="Tomcat OACC 0.1 (rjung)"> <subsection name="Cluster"> <fix> + <bug>48398</bug>: Make objects used as locks final to ensure correct + operation. Patch provided by sebb. + Port from Tomcat 6.0. (rjung) + </fix> + <fix> <bug>47502</bug>: Don't replicate session attributes known not to be serializable. Port from Tomcat 6.0. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=934577&r1=934576&r2=934577&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java Thu Apr 15 20:08:58 2010 @@ -107,7 +107,7 @@ public class DeltaSession extends Standa private transient long lastTimeReplicated = System.currentTimeMillis(); - protected Lock diffLock = new ReentrantReadWriteLock().writeLock(); + protected final Lock diffLock = new ReentrantReadWriteLock().writeLock(); private long version; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org