Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-05-23 06:05:09 +0000
committerJan Bartel2013-05-23 06:05:09 +0000
commit8ed25ec478a5368887e4501434f9074854d2572f (patch)
treefb2bd7e68a8312ff3e6a2d63d31f91a42cfb4d07 /jetty-ant/src/main
parent610499de67af6515934ff264e435283f8ed458bf (diff)
downloadorg.eclipse.jetty.project-8ed25ec478a5368887e4501434f9074854d2572f.tar.gz
org.eclipse.jetty.project-8ed25ec478a5368887e4501434f9074854d2572f.tar.xz
org.eclipse.jetty.project-8ed25ec478a5368887e4501434f9074854d2572f.zip
408768 JSTL jars not scanned by jetty-ant
Diffstat (limited to 'jetty-ant/src/main')
-rw-r--r--jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
index 44032ba746..dca34758fc 100644
--- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
+++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
@@ -631,7 +631,7 @@ public class AntWebAppContext extends WebAppContext
/**
- * @see WebApplicationProxy#start()
+ *
*/
public void doStart()
{
@@ -641,7 +641,10 @@ public class AntWebAppContext extends WebAppContext
if (jettyEnvXml != null && jettyEnvXml.exists())
envConfiguration.setJettyEnvXml(Resource.toURL(jettyEnvXml));
- AntURLClassLoader parentLoader = new AntURLClassLoader((AntClassLoader)this.getClass().getClassLoader());
+ ClassLoader parentLoader = this.getClass().getClassLoader();
+ if (parentLoader instanceof AntClassLoader)
+ parentLoader = new AntURLClassLoader((AntClassLoader)parentLoader);
+
setClassLoader(new WebAppClassLoader(parentLoader, this));
if (attributes != null && attributes.getAttributes() != null)
{

Back to the top