Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jan Bartel 2017-01-19 10:25:13 +11:00
parent a7938910b7 eeae3bfdad
commit 255ae29e2a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java
View File

@ -201,8 +201,9 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor
throw new IllegalArgumentException("TLD not found: "+r); throw new IllegalArgumentException("TLD not found: "+r);
} }
if (tlds.size()>0) //empty list signals that tlds were prescanned but none found.
context.setAttribute(MetaInfConfiguration.METAINF_TLDS,tlds); //a missing METAINF_TLDS attribute means that prescanning was not done.
context.setAttribute(MetaInfConfiguration.METAINF_TLDS,tlds);
break; break;
} }