← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/util/CustomObjectInputStream.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/util/CustomObjectInputStream.java
30
30
 *
31
31
 * @author Craig R. McClanahan
32
32
 * @author Bip Thelin
33
 
 * @version $Revision: 467222 $, $Date: 2006-10-24 05:17:11 +0200 (Di, 24. Okt 2006) $
 
33
 * @version $Id: CustomObjectInputStream.java 939353 2010-04-29 15:50:43Z kkolinko $
34
34
 */
35
35
 
36
36
public final class CustomObjectInputStream
74
74
        try {
75
75
            return Class.forName(classDesc.getName(), false, classLoader);
76
76
        } catch (ClassNotFoundException e) {
77
 
            // Try also the superclass because of primitive types
78
 
            return super.resolveClass(classDesc);
 
77
            try {
 
78
                // Try also the superclass because of primitive types
 
79
                return super.resolveClass(classDesc);
 
80
            } catch (ClassNotFoundException e2) {
 
81
                // Rethrow original exception, as it can have more information
 
82
                // about why the class was not found. BZ 48007
 
83
                throw e;
 
84
            }
79
85
        }
80
86
    }
81
87