From b3382be6596063ee9868661a38cf8bedfa8f2a84 Mon Sep 17 00:00:00 2001
From: jbescos <jorge.bescos.gascon@oracle.com>
Date: Mon, 17 Feb 2020 23:21:43 +0100
Subject: [PATCH] Query parameters were not included in netty URI (#4393)

* Query parameters were not included in netty URI

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>

(cherry picked from commit 706c01c799862dee86b9465de64baef44cf61ce7)
Signed-off-by: Jan Supol <jan.supol@oracle.com>
---
 .../glassfish/jersey/netty/connector/NettyConnector.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
index 1745e28098..5a3627d9fb 100644
--- a/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
+++ b/connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/NettyConnector.java
@@ -310,6 +310,14 @@ private String buildPathWithQueryParameters(URI requestUri) {
         }
     }
 
+    private String buildPathWithQueryParameters(URI requestUri) {
+        if (requestUri.getRawQuery() != null) {
+            return String.format("%s?%s", requestUri.getRawPath(), requestUri.getRawQuery());
+        } else {
+            return requestUri.getRawPath();
+        }
+    }
+
     @Override
     public String getName() {
         return "Netty 4.1.x";