1 files changed, 6 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 4f1a0bf0d03..6a25937592b 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -16,7 +16,6 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.security.Principal;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -89,7 +88,11 @@ public class HttpRequest extends Request {
             this.version = version;
             this.remoteAddress = remoteAddress;
             this.parameters.putAll(getUriQueryParameters(uri));
-            this.connectedAt = (connectedAtMillis != null) ? connectedAtMillis : creationTime(TimeUnit.MILLISECONDS);
+            if (connectedAtMillis != null) {
+                this.connectedAt = connectedAtMillis;
+            } else {
+                this.connectedAt = creationTime(TimeUnit.MILLISECONDS);
+            }
         } catch (Throwable e) {
             release();
             throw e;
@@ -226,7 +229,7 @@ public class HttpRequest extends Request {
     public List<Cookie> decodeCookieHeader() {
         List<String> cookies = headers().get(HttpHeaders.Names.COOKIE);
         if (cookies == null) {
-            return Collections.emptyList();
+            return List.of();
         }
         List<Cookie> ret = new LinkedList<>();
         for (String cookie : cookies) {