Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x

jetty · Jan 26, 2023 · 63d963d · 63d963d
2 parents 7f0294d + 07d36f7
commit 63d963d
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 52 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!groovy
 
 pipeline {
-  agent any
+  agent none
   // save some io during the build
   options {
     skipDefaultCheckout()

diff --git a/...etty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/JettyStopMojo.java b/...etty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/JettyStopMojo.java
@@ -220,9 +220,19 @@ private String send(String command, int wait)
             }
             else
             {
-                //Wait only a small amount of time to ensure TCP has sent the message
-                s.setSoTimeout(1000);
-                s.getInputStream().read();
+                try
+                {
+                    //Wait only a small amount of time to ensure TCP has sent the message
+                    s.setSoTimeout(1000);
+                    s.getInputStream().read();
+                }
+                catch (Exception e)
+                {
+                    if (getLog().isDebugEnabled())
+                        getLog().error("Error after sending command: " + command + ". Check the server state.", e);
+                    else
+                        getLog().info(e.getMessage() + " after sending command: " + command + ". Check the server state.");
+                }
             }
 
             return response;

diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Dispatcher.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Dispatcher.java
@@ -170,15 +170,15 @@ protected void forward(ServletRequest request, ServletResponse response, Dispatc
                 checkUriViolations(_uri, baseRequest);
 
                 // If we have already been forwarded previously, then keep using the established
-                // original value. Otherwise, this is the first forward and we need to establish the values.
+                // original value. Otherwise, this is the first forward, and we need to establish the values.
                 // Note: the established value on the original request for pathInfo and
                 // for queryString is allowed to be null, but cannot be null for the other values.
                 // Note: the pathInfo is passed as the pathInContext since it is only used when there is
                 // no mapping, and when there is no mapping the pathInfo is the pathInContext.
                 if (old_attr.getAttribute(FORWARD_REQUEST_URI) == null)
                     baseRequest.setAttributes(new ForwardAttributes(old_attr,
                         old_uri.getPath(),
-                        old_context.getContextHandler().getContextPathEncoded(),
+                        baseRequest.getContextPath(),
                         baseRequest.getPathInContext(),
                         source_mapping,
                         old_uri.getQuery()));