From 897478a4f6812c62391d848ebca4271f7b991ce5 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 16 Oct 2023 05:52:56 +0200 Subject: [PATCH] Fix #10656 return value for HttpServletRequest.getProtocolRequestId() in ee10 (#10715) Return empty string for HTTP/1.x and previous --- .../org/eclipse/jetty/ee10/servlet/ServletApiRequest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java index 986bcb6a663d..036340dd982c 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java @@ -187,7 +187,11 @@ public String getRequestId() @Override public String getProtocolRequestId() { - return getRequest().getId(); + return switch (getRequest().getConnectionMetaData().getHttpVersion()) + { + case HTTP_2, HTTP_3 -> getRequest().getId(); + default -> ""; + }; } @Override