Issue #7277 - Fixing NPE from updated getLocalPort

Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Dec 16, 2021 · 18eadf2 · 18eadf2
1 parent 9724765
commit 18eadf2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -1044,9 +1044,11 @@ public int getLocalPort()
             int localPort = _channel.getLocalPort();
             if (localPort > 0)
                 return localPort;
+            InetSocketAddress local = _channel.getLocalAddress();
+            if (local != null)
+                return local.getPort();
         }
-        InetSocketAddress local = _channel.getLocalAddress();
-        return local == null ? 0 : local.getPort();
+        return 0;
     }
 
     /*