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-12.0.x' into jetty-12.1.x

This commit is contained in:
Jan Bartel 2024-09-02 16:30:52 +10:00
parent e58eef20d7 caa09ad2cc
commit ee5968e748
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-core/jetty-maven/src/main/java/org/eclipse/jetty/maven/ServerSupport.java
View File

@ -23,10 +23,12 @@ import org.eclipse.jetty.maven.MavenServerConnector;
import org.eclipse.jetty.maven.PluginLog; import org.eclipse.jetty.maven.PluginLog;
import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.security.LoginService;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.RequestLog;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.util.resource.ResourceFactory; import org.eclipse.jetty.util.resource.ResourceFactory;
import org.eclipse.jetty.xml.XmlConfiguration; import org.eclipse.jetty.xml.XmlConfiguration;
@ -56,6 +58,9 @@ public class ServerSupport
if (requestLog != null) if (requestLog != null)
server.setRequestLog(requestLog); server.setRequestLog(requestLog);
if (server.getDefaultHandler() == null)
server.setDefaultHandler(new DefaultHandler());
ContextHandlerCollection contexts = findContextHandlerCollection(server); ContextHandlerCollection contexts = findContextHandlerCollection(server);
if (contexts == null) if (contexts == null)
{ {