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
This commit is contained in:
parent
147722467a
commit
0256dcc2cc
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue