Author: kkolinko Date: Wed Mar 10 22:27:29 2010 New Revision: 921597 URL: http://svn.apache.org/viewvc?rev=921597&view=rev Log: 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/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921597&r1=921596&r2=921597&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 22:27:29 2010 @@ -107,13 +107,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt -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, jfclere - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701 Tag account of TagVariableInfo when implementing the rules of JSP.5.3 http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java?rev=921597&r1=921596&r2=921597&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java Wed Mar 10 22:27:29 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/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=921597&r1=921596&r2=921597&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 10 22:27:29 2010 @@ -141,6 +141,10 @@ <bug>48004</bug>: Allow applications to set the Server header. (markt) </fix> <fix> + <bug>48007</bug>: Improve exception processing in + CustomObjectInputStream. (kkolinko) + </fix> + <fix> <bug>48049</bug>: Fix copy and paste error so <code>NamingContext.destroySubContext()</code> works correctly. Patch provided by gingyang.xu (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org