This is an automated email from the ASF dual-hosted git repository.
dakirily pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 6b2ddfd5a3 QPID-8760: [Broker-J] ServletContextHandler.setHandler
should not be called directly (#440)
6b2ddfd5a3 is described below
commit 6b2ddfd5a3f3e86d3b41c63ba4654480aa8af4ce
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Sat Sep 19 15:39:00 2026 +0200
QPID-8760: [Broker-J] ServletContextHandler.setHandler should not be called
directly (#440)
---
.../qpid/server/management/plugin/HttpManagement.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 6b5205470c..07b0e4e550 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -49,7 +49,10 @@ import jakarta.servlet.MultipartConfigElement;
import jakarta.servlet.http.HttpServletRequest;
import org.eclipse.jetty.ee11.servlet.ErrorPageErrorHandler;
+import org.eclipse.jetty.ee11.servlet.FilterHolder;
+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletHandler;
+import org.eclipse.jetty.ee11.servlet.ServletHolder;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.io.Connection;
@@ -66,10 +69,6 @@ import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.ee11.servlet.FilterHolder;
-import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee11.servlet.ServletHolder;
import org.eclipse.jetty.server.handler.CrossOriginHandler;
import org.eclipse.jetty.util.annotation.Name;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -348,21 +347,18 @@ public class HttpManagement extends
AbstractPluginAdapter<HttpManagement> implem
lastPort = port.getPort();
}
- final ContextHandlerCollection contextCollection = new
ContextHandlerCollection();
-
final RewriteHandler rewriteHandler = new RewriteHandler();
- rewriteHandler.setHandler(contextCollection);
rewriteHandler.addRule(new CompactPathRule());
final CrossOriginHandler corsHandler = new CrossOriginHandler();
- corsHandler.setHandler(rewriteHandler);
corsHandler.setAllowedOriginPatterns(getCorsAllowOrigins());
corsHandler.setAllowedMethods(getCorsAllowMethods());
corsHandler.setAllowedHeaders(getCorsAllowHeaders());
corsHandler.setAllowCredentials(getCorsAllowCredentials());
final ServletContextHandler root = new ServletContextHandler("/",
ServletContextHandler.SESSIONS);
- root.setHandler(corsHandler);
+ root.insertHandler(rewriteHandler);
+ root.insertHandler(corsHandler);
server.setHandler(root);
final ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
