From 090219664e005e2e3448bb189c11c9534d9d2392 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 24 Mar 2008 20:30:14 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/loader/LocalStrings.properties | 2 +- java/org/apache/catalina/loader/WebappClassLoader.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties index d90297dd4..89489813d 100644 --- 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 4df1b54f2..28c93d3cc 100644 --- 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; -- 2.11.0