(activemq-artemis) branch main updated: ARTEMIS-5226 Jetty choking on bad URI

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 3bac04acc1 ARTEMIS-5226 Jetty choking on bad URI
3bac04acc1 is described below

commit 3bac04acc1945e5876704ba4b8829cb7d0e94d93
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Jan 6 10:16:40 2025 -0600

    ARTEMIS-5226 Jetty choking on bad URI
    
    When the broker is started on Windows Jetty logs an exception at DEBUG
    level regarding a malformed URL which is set via the
    setBaseResourceAsString method on either
    org.eclipse.jetty.server.handler.ResourceHandler or
    org.eclipse.jetty.server.handler.ContextHandler.
    
    This commit fixes that by using setBaseResourceAsPath instead. It also
    removes 2 instances of setBaseResourceAsString on the ResourceHandler.
    These are not necessary because the value set on the ContextHandler will
    suffice.
---
 .../org/apache/activemq/artemis/component/WebServerComponent.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 90b59679d9..ba266eaf1e 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -201,24 +201,22 @@ public class WebServerComponent implements ExternalComponent, WebServerComponent
       server.setConnectors(connectors);
 
       ResourceHandler homeResourceHandler = new ResourceHandler();
-      homeResourceHandler.setBaseResourceAsString(homeWarDir.toString());
       homeResourceHandler.setDirAllowed(false);
       homeResourceHandler.setWelcomeFiles("index.html");
 
       ContextHandler homeContext = new ContextHandler();
       homeContext.setContextPath("/");
-      homeContext.setBaseResourceAsString(homeWarDir.toString());
+      homeContext.setBaseResourceAsPath(homeWarDir);
       homeContext.setHandler(homeResourceHandler);
       homeContext.setVirtualHosts(Arrays.asList(virtualHosts));
 
       ResourceHandler instanceResourceHandler = new ResourceHandler();
-      instanceResourceHandler.setBaseResourceAsString(instanceWarDir.toString());
       instanceResourceHandler.setDirAllowed(false);
       instanceResourceHandler.setWelcomeFiles("index.html");
 
       ContextHandler instanceContext = new ContextHandler();
       instanceContext.setContextPath("/");
-      instanceContext.setBaseResourceAsString(instanceWarDir.toString());
+      instanceContext.setBaseResourceAsPath(instanceWarDir);
       instanceContext.setHandler(instanceResourceHandler);
       instanceContext.setVirtualHosts(Arrays.asList(virtualHosts));
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact