Skip to content

Commit

Permalink
Removed WebAppLoaderFix as it is now redundant
Browse files Browse the repository at this point in the history
Thanks to GregDThomas for spotting: IIRC it only worked on older versions of JRE/Jetty, so it's probably long redundant now.

Originally created to fix https://igniterealtime.atlassian.net/browse/OF-1522 in #1228
(with comment "Note; we may need to revisit this come Java 9.")
  • Loading branch information
viv committed Sep 4, 2023
1 parent 58bef71 commit d1d1d12
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 239 deletions.
232 changes: 0 additions & 232 deletions xmppserver/src/main/java/org/eclipse/jetty/util/WebAppLoaderFix.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.WebAppLoaderFix;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.webapp.WebAppContext;
Expand Down Expand Up @@ -766,12 +765,6 @@ public void addJettyHandler( Handler handler )
*/
public void removeJettyHandler( Handler handler )
{
if (handler instanceof WebAppContext) {
// A work-around of the Jetty bug described at https://github.com/eclipse/jetty.project/issues/1425
// NOTE: According to some comments on WebAppLoaderFix, this may stop working on Java 9.
// Hopefully the Jetty team will have fixed the underlying bug by then
WebAppLoaderFix.checkAndClose(((WebAppContext) handler).getClassLoader());
}
extensionHandlers.removeHandler( handler );
if ( handler.isStarted() )
{
Expand Down

0 comments on commit d1d1d12

Please sign in to comment.