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

This commit is contained in:
Greg Wilkins 2022-09-23 16:56:56 +10:00
parent 138219d7da d76d64c414
commit c4200aee9f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-ee8/test-ee8-sessions/test-ee8-infinispan-sessions/pom.xml
View File

@ -128,13 +128,6 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<scope>test</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>

12
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HotSwapHandler.java
View File

@ -63,10 +63,20 @@ public class HotSwapHandler extends AbstractHandlerContainer
try
{
Server server = getServer();
if (handler == _handler)
return;
Handler oldHandler = _handler;
if (handler != null)
{
handler.setServer(server);
updateBean(_handler, handler, true);
addBean(handler, true);
if (oldHandler != null && oldHandler.isStarted())
handler.start();
}
_handler = handler;
if (oldHandler != null)
removeBean(oldHandler);
}
catch (Exception e)
{