fix handling of null query in getPathAndQuery method (#2927)

christiangoerdes · web-flow · commit a4a4edf6c270 · 2026-05-05T22:00:50.000+02:00
diff --git a/core/src/main/java/com/predic8/membrane/core/resolver/RuleResolver.java b/core/src/main/java/com/predic8/membrane/core/resolver/RuleResolver.java
@@ -94,10 +94,11 @@ public InputStream resolve(String urlString) {
         }
     }
 
-    private static @NotNull String getPathAndQuery(URI uri) {
-        if (uri.getQuery().isEmpty())
+   private static @NotNull String getPathAndQuery(URI uri) {
+        String query = uri.getQuery();
+        if (query == null || query.isEmpty())
             return uri.getPath();
-        return uri.getPath() + "?" + uri.getQuery();
+        return uri.getPath() + "?" + query;
     }
 
     protected static String getRuleName(String url) {

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,11 @@ public InputStream resolve(String urlString) {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- private static @NotNull String getPathAndQuery(URI uri) {`
`98`		`- if (uri.getQuery().isEmpty())`
	`97`	`+ private static @NotNull String getPathAndQuery(URI uri) {`
	`98`	`+ String query = uri.getQuery();`
	`99`	`+ if (query == null \|\| query.isEmpty())`
`99`	`100`	`return uri.getPath();`
`100`		`- return uri.getPath() + "?" + uri.getQuery();`
	`101`	`+ return uri.getPath() + "?" + query;`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`protected static String getRuleName(String url) {`