478757 - DebugHandler thread name is mangled

+ Replicating reopened bug with double-scheme https
  in testcase
+ Adding safety check for https in thread name determination

1 files changed, 8 insertions, 2 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
index 6e0061d0d3..52d07c8820 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java
@@ -27,6 +27,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.Connector;
@@ -66,8 +67,13 @@ public class DebugHandler extends HandlerWrapper implements Connection.Listener
         boolean suspend=false;
         boolean retry=false;
         String name=(String)request.getAttribute("org.eclipse.jetty.thread.name");
-        if (name==null) {
-            name=old_name+":"+baseRequest.getScheme()+":"+baseRequest.getHttpURI();
+        if (name == null)
+        {
+            HttpURI baseUri = baseRequest.getHttpURI();
+            if (baseUri.getScheme() == null)
+                name = old_name + ":" + baseRequest.getScheme() + ":" + baseUri.toString();
+            else
+                name = old_name + ":" + baseUri.toString();
         }
         else
             retry=true;