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

Use XML created Server

This commit is contained in:
Joakim Erdfelt 2022-08-05 10:23:56 -05:00
parent 4af68620ae
commit b8334b6786
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/JettyEmbedder.java
View File

@ -245,13 +245,12 @@ public class JettyEmbedder extends AbstractLifeCycle
*/
private void configure() throws Exception
{
if (server == null)
server = new Server();
/* Configure the server */
//apply any configs from jetty.xml files first
Server tmp = ServerSupport.applyXmlConfigurations(server, jettyXmlFiles, jettyProperties);
// apply any configs from jetty.xml files first
server = ServerSupport.applyXmlConfigurations(server, jettyXmlFiles, jettyProperties);
server.setStopAtShutdown(stopAtShutdown);

2
jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/JettyEmbedder.java
View File

@ -250,7 +250,7 @@ public class JettyEmbedder extends ContainerLifeCycle
/* Configure the server */
//apply any configs from jetty.xml files first
Server tmp = ServerSupport.applyXmlConfigurations(server, jettyXmlFiles, jettyProperties);
server = ServerSupport.applyXmlConfigurations(server, jettyXmlFiles, jettyProperties);
server.setStopAtShutdown(stopAtShutdown);