Merge remote-tracking branch 'origin/jetty-9.4.x'
This commit is contained in:
commit
580310f523
|
@ -72,7 +72,7 @@ public class JettyWebAppContext extends WebAppContext
|
|||
private final List<File> _webInfClasses = new ArrayList<>();
|
||||
private final List<File> _webInfJars = new ArrayList<>();
|
||||
private final Map<String, File> _webInfJarMap = new HashMap<String, File>();
|
||||
private List<File> _classpathFiles = new ArrayList<>(); //webInfClasses+testClasses+webInfJars
|
||||
private List<File> _classpathFiles; //webInfClasses+testClasses+webInfJars
|
||||
private String _jettyEnvXml;
|
||||
private List<Overlay> _overlays;
|
||||
|
||||
|
@ -365,6 +365,7 @@ public class JettyWebAppContext extends WebAppContext
|
|||
_webInfClasses.add(_classes);
|
||||
|
||||
// Set up the classpath
|
||||
_classpathFiles = new ArrayList<>();
|
||||
_classpathFiles.addAll(_webInfClasses);
|
||||
_classpathFiles.addAll(_webInfJars);
|
||||
|
||||
|
|
Loading…
Reference in New Issue