Fix: URIBuilder.getFirstQueryParam throws NPE when query is emty (#449)

apache · Dec 19, 2023 · d39031d · d39031d
1 parent d1c77bc
commit d39031d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
@@ -984,6 +984,9 @@ public List<NameValuePair> getQueryParams() {
      * @since 5.2
      */
     public NameValuePair getFirstQueryParam(final String name) {
+        if (queryParams == null) {
+            return null;
+        }
         return queryParams.stream().filter(e -> name.equals(e.getName())).findFirst().orElse(null);
     }
 

diff --git a/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java b/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIBuilder.java
@@ -392,6 +392,8 @@ public void testGetFirstNamedParameter() throws Exception {
         //
         uribuilder = new URIBuilder("http://localhost:80/?param=some%20other%20stuff&blah=blah&blah=blah2");
         Assertions.assertEquals("blah", uribuilder.getFirstQueryParam("blah").getValue());
+        uribuilder.removeQuery();
+        Assertions.assertNull(uribuilder.getFirstQueryParam("param"));
     }
 
     @Test