Set explicit port when -1

1 files changed, 6 insertions, 1 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/ApacheCluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/ApacheCluster.java
index fab6b958369..b7244d40a72 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/ApacheCluster.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/ApacheCluster.java
@@ -68,7 +68,7 @@ class ApacheCluster implements Cluster {
         endpoint.inflight.incrementAndGet();
         try {
             request.setScheme(endpoint.url.getScheme());
-            request.setAuthority(new URIAuthority(endpoint.url.getHost(), endpoint.url.getPort()));
+            request.setAuthority(new URIAuthority(endpoint.url.getHost(), portOf(endpoint.url)));
             endpoint.client.execute(request,
                                     new FutureCallback<SimpleHttpResponse>() {
                                         @Override public void completed(SimpleHttpResponse response) { vessel.complete(new ApacheHttpResponse(response)); }
@@ -138,6 +138,11 @@ class ApacheCluster implements Cluster {
                                                    tlsStrategyBuilder.build());
     }
 
+    private static int portOf(URI url) {
+        return url.getPort() == -1 ? url.getScheme().equals("http") ? 80 : 443
+                                   : url.getPort();
+    }
+
     private static class ApacheHttpResponse implements HttpResponse {
 
         private final SimpleHttpResponse wrapped;