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
commit 255ae29e2a
1 changed files with 4 additions and 3 deletions

View File

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