From fdff282605b26eb1ddca946b7f996a2cb4f749c2 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 7 Oct 2010 18:21:17 +0000 Subject: [PATCH] JETTY-1288 added info for when atypical classloader set on WebAppContext git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2330 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../main/java/org/eclipse/jetty/webapp/WebAppContext.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index cd76a5318e7..41b38c92997 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -5,6 +5,7 @@ jetty-7.2.0.RC1-SNAPSHOT + 326734 Configure Digest maxNonceAge with Security handler init param + 327109 Fixed AJP handling of empty packets + 327183 Allow better configurability of HttpClient for TLS/SSL + + JETTY-1288 Info statement when atypical classloader set on WebAppContext jetty-7.2.0.RC0 1 Oct 2010 + 314087 Simplified SelectorManager diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index 6fc769f10d9..344be52aa3b 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -338,6 +338,12 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL public void setClassLoader(ClassLoader classLoader) { super.setClassLoader(classLoader); + + if ( !(classLoader instanceof WebAppClassLoader) ) + { + Log.info("NOTE: detected a classloader which is not an instance of WebAppClassLoader being set on WebAppContext, some typical class and resource locations may be missing on: " + toString() ); + } + if (classLoader!=null && classLoader instanceof WebAppClassLoader && getDisplayName()!=null) ((WebAppClassLoader)classLoader).setName(getDisplayName()); }