Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-08-27 04:05:05 +0000
committerJan Bartel2012-08-27 04:05:05 +0000
commit28667f170765f8042b4fd131fac446480ec501de (patch)
tree00f47d77c89395f34034f016ec64be05648bb633
parentad63e3f3f1fa6785e3d65382783d53b47957c860 (diff)
downloadorg.eclipse.jetty.project-28667f170765f8042b4fd131fac446480ec501de.tar.gz
org.eclipse.jetty.project-28667f170765f8042b4fd131fac446480ec501de.tar.xz
org.eclipse.jetty.project-28667f170765f8042b4fd131fac446480ec501de.zip
387953 jstl does not work with jetty-7 in osgi
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java
index 89b2218b52..580f363f81 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java
@@ -111,7 +111,13 @@ public class TagLibConfiguration extends AbstractConfiguration
//Get the system classpath tlds and tell jasper about them, if jasper is on the classpath
try
{
- Class<?> clazz = getClass().getClassLoader().loadClass("org.apache.jasper.compiler.TldLocationsCache");
+
+ ClassLoader loader = _context.getClassLoader();
+ if (loader == null || loader.getParent() == null)
+ loader = getClass().getClassLoader();
+ else
+ loader = loader.getParent();
+ Class<?> clazz = loader.loadClass("org.apache.jasper.compiler.TldLocationsCache");
assert clazz!=null;
Collection<Resource> tld_resources = (Collection<Resource>)_context.getAttribute(TLD_RESOURCES);

Back to the top