Handle query both in given path and properties map

1 files changed, 3 insertions, 3 deletions

diff --git a/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java
index cf32683ce19..1a160663d43 100644
--- a/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java
+++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java
@@ -56,9 +56,9 @@ public class HttpEndpoint implements Endpoint {
     @Override
     public HttpRequest.Builder request(String path, Map<String, String> properties) {
         return HttpRequest.newBuilder(endpoint.resolve(path +
-                                                       (properties.isEmpty() ? "" : properties.entrySet().stream()
-                                                                                              .map(entry -> encode(entry.getKey(), UTF_8) + "=" + encode(entry.getValue(), UTF_8))
-                                                                                              .collect(Collectors.joining("&", "?", "")))));
+                                                       properties.entrySet().stream()
+                                                                 .map(entry -> encode(entry.getKey(), UTF_8) + "=" + encode(entry.getValue(), UTF_8))
+                                                                 .collect(Collectors.joining("&", path.contains("?") ? "&" : "?", ""))));
     }
 
 }