Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50950

Correct possible NotSerializableException for an authenticated session when running with a security manager.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1099772 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 34cc7df..8d6c609 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -625,7 +625,9 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
         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 StandardSession implements Externalizable,Clus
             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();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 762b5a3..506f1d6 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>