Author: markt
Date: Sun Apr 11 13:50:12 2010
New Revision: 932901
URL: http://svn.apache.org/viewvc?rev=932901&view=rev
Log:
Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(), to help
find the cause behind BZ 48007.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.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=932901&r1=932900&r2=932901&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:50:12 2010
@@ -113,13 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
- Improve exception processing in CustomObjectInputStream#resolveClass(),
- to help find the cause behind BZ 48007.
- http://svn.apache.org/viewvc?rev=920912&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Take account of TagVariableInfo when implementing the rules of JSP.5.3
http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=932901&r1=932900&r2=932901&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
Sun Apr 11 13:50:12 2010
@@ -74,8 +74,14 @@ public final class CustomObjectInputStre
try {
return Class.forName(classDesc.getName(), false, classLoader);
} catch (ClassNotFoundException e) {
- // Try also the superclass because of primitive types
- return super.resolveClass(classDesc);
+ try {
+ // Try also the superclass because of primitive types
+ return super.resolveClass(classDesc);
+ } catch (ClassNotFoundException e2) {
+ // Rethrow original exception, as it can have more information
+ // about why the class was not found. BZ 48007
+ throw e;
+ }
}
}
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=932901&r1=932900&r2=932901&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:50:12 2010
@@ -46,6 +46,10 @@
identification. (markt)
</add>
<fix>
+ Improve exception handling on session de-serialization to assist in
+ identifying the root cause of <bug>48007</bug>. (kkolinko)
+ </fix>
+ <fix>
<bug>48629</bug>: Allow user names as well as DNs to be used with the
nested role search. Add roleNested to the documentation. Patch provided
by Felix Schumacher. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
