Author: markt
Date: Thu May 5 12:38:44 2011
New Revision: 1099772
URL: http://svn.apache.org/viewvc?rev=1099772&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50950
Correct possible NotSerializableException for an authenticated session when
running with a security manager.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/webapps/docs/changelog.xml
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=1099772&r1=1099771&r2=1099772&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu May
5 12:38:44 2011
@@ -625,7 +625,9 @@ public class DeltaSession extends Standa
try {
lock();
super.setAttribute(name,value, notify);
- if (addDeltaRequest && (deltaRequest != null))
deltaRequest.setAttribute(name, value);
+ if (addDeltaRequest && deltaRequest != null && !exclude(name)) {
+ deltaRequest.setAttribute(name, value);
+ }
} finally {
unlock();
}
@@ -804,7 +806,9 @@ public class DeltaSession extends Standa
if (value == null) return;
super.removeAttributeInternal(name,notify);
- if (addDeltaRequest && (deltaRequest != null))
deltaRequest.removeAttribute(name);
+ if (addDeltaRequest && deltaRequest != null && !exclude(name)) {
+ deltaRequest.removeAttribute(name);
+ }
}finally {
unlock();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1099772&r1=1099771&r2=1099772&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 5 12:38:44 2011
@@ -187,6 +187,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>50950</bug>: Correct possible NotSerializableException for an
+ authenticated session when running with a security manager. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
