Author: rjung
Date: Thu Apr 15 20:04:35 2010
New Revision: 934574
URL: http://svn.apache.org/viewvc?rev=934574&view=rev
Log:
Fix BZ47502: Don't try and replicate attributes we know to be non-serializable.
Patch by Tim Funk.
Backport of r890946 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=934574&r1=934573&r2=934574&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Thu Apr 15 20:04:35 2010
@@ -32,6 +32,11 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<fix>
+ <bug>47502</bug>: Don't replicate session attributes known not to be
+ serializable.
+ Port from Tomcat 6.0. (rjung)
+ </fix>
+ <fix>
<bug>47515</bug>: Correctly replicate timestamp during startup.
Port from Tomcat 6.0. (rjung)
</fix>
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=934574&r1=934573&r2=934574&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:04:35 2010
@@ -735,7 +735,7 @@ public class DeltaSession extends Standa
for (int i = 0; i < keys.length; i++) {
Object value = null;
value = attributes.get(keys[i]);
- if (value == null)
+ if (value == null || exclude(keys[i]))
continue;
else if (value instanceof Serializable) {
saveNames.add(keys[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
