Use Rainer's improved patch for bug 44633

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

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index d90297d..8948981 100644 (file)
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -29,7 +29,7 @@ standardLoader.removeRepository=Removing repository {0}
 standardLoader.starting=Starting this Loader
 standardLoader.stopping=Stopping this Loader
 webappClassLoader.stopped=Illegal access: this web application instance has been stopped already.  Could not load {0}.  The eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact.
-webappClassLoader.wrongVersion=Unable to load class {0} due to a bad version number in the .class file.
+webappClassLoader.wrongVersion=(unable to load class {0})
 webappLoader.addRepository=Adding repository {0}
 webappLoader.deploy=Deploying class repositories to work directory {0}
 webappLoader.jarDeploy=Deploy JAR {0} to {1}

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 4df1b54..28c93d3 100644 (file)
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -1848,7 +1848,9 @@ public class WebappClassLoader
                             new CodeSource(entry.codeBase, entry.certificates));
                 } catch (UnsupportedClassVersionError ucve) {
                     throw new UnsupportedClassVersionError(
-                            sm.getString("webappClassLoader.wrongVersion", name));
+                            ucve.getLocalizedMessage() + " " +
+                            sm.getString("webappClassLoader.wrongVersion",
+                                    name));
                 }
                 entry.loadedClass = clazz;
                 entry.binaryContent = null;