Default to request's localport if connector is already closed

1 files changed, 7 insertions, 1 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
index 03ab06b9be1..b38b9dcdfb2 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
@@ -60,7 +60,7 @@ class AccessLogRequestLog extends AbstractLifeCycle implements org.eclipse.jetty
             long endTime = System.currentTimeMillis();
             builder.peerAddress(peerAddress)
                     .peerPort(peerPort)
-                    .localPort(getConnectorLocalPort(request))
+                    .localPort(getLocalPort(request))
                     .timestamp(Instant.ofEpochMilli(startTime))
                     .duration(Duration.ofMillis(Math.max(0, endTime - startTime)))
                     .contentSize(response.getHttpChannel().getBytesWritten())
@@ -138,6 +138,12 @@ class AccessLogRequestLog extends AbstractLifeCycle implements org.eclipse.jetty
         return request.getRemotePort();
     }
 
+    private static int getLocalPort(Request request) {
+        int connectorLocalPort = getConnectorLocalPort(request);
+        if (connectorLocalPort <= 0) return request.getLocalPort(); // If connector is already closed
+        return connectorLocalPort;
+    }
+
     private static OptionalInt parsePort(String port) {
         try {
             return OptionalInt.of(Integer.parseInt(port));