Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2009-05-15 01:01:41 +0000
committerJan Bartel2009-05-15 01:01:41 +0000
commit0256dcc2ccf188732e53865da7d0b332b0278154 (patch)
treea33b5cd982086cf03bf5d1c10a084817bd7e82e8
parent147722467a9b61f2b03150ad9bb3f3974797c18d (diff)
downloadorg.eclipse.jetty.project-0256dcc2ccf188732e53865da7d0b332b0278154.tar.gz
org.eclipse.jetty.project-0256dcc2ccf188732e53865da7d0b332b0278154.tar.xz
org.eclipse.jetty.project-0256dcc2ccf188732e53865da7d0b332b0278154.zip
JETTY-1020 (Patch was not applied due to different code, but a similar try/catch was implemented).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@216 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java13
2 files changed, 11 insertions, 3 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 745921fcab..8023bf0ba9 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -9,6 +9,7 @@ jetty-7.0.0.M2-SNAPSHOT
+ JETTY-1004 CERT VU#402580 Canonical path handling includes ? in path segment
+ JETTY-1014 Enable start-stop-daemon by default on jetty.sh (START_STOP_DAEMON=1)
+ JETTY-1015 Reduce BayeuxClient and HttpClient lock contention
+ + JETTY-1020 ZipException in org.mortbay.jetty.webapp.TagLibConfiguration prevents all contexts from being loaded
+ 275396 Added ScopedHandler to set servlet scope before security handler
+ 275396 Added Authentication.Wrapped to allow JSAPI wrapping
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 e5ae1a7c8c..825e96cb60 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
@@ -187,9 +187,16 @@ public class TagLibConfiguration implements Configuration
Pattern containerPattern = (tmp==null?null:Pattern.compile(tmp));
TagLibJarScanner tldScanner = new TagLibJarScanner();
- tldScanner.setTldSet(tlds);
- tldScanner.scan(webInfPattern, Thread.currentThread().getContextClassLoader(), true, false);
- tldScanner.scan(containerPattern, Thread.currentThread().getContextClassLoader().getParent(), false, true);
+ try
+ {
+ tldScanner.setTldSet(tlds);
+ tldScanner.scan(webInfPattern, Thread.currentThread().getContextClassLoader(), true, false);
+ tldScanner.scan(containerPattern, Thread.currentThread().getContextClassLoader().getParent(), false, true);
+ }
+ catch (Exception e)
+ {
+ Log.warn(e);
+ }
// Create a TLD parser

Back to the top