From 28667f170765f8042b4fd131fac446480ec501de Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 27 Aug 2012 14:05:05 +1000 Subject: 387953 jstl does not work with jetty-7 in osgi --- .../main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 tld_resources = (Collection)_context.getAttribute(TLD_RESOURCES); -- cgit v1.2.3