Issue #7277 - Adding missing null check

Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Jan 5, 2022 · 3199438 · 3199438
1 parent 2eaec36
commit 3199438
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -334,18 +334,6 @@ public String getLocalName()
         return null;
     }
 
-    /**
-     * @return return the HttpConfiguration server authority override
-     */
-    public HostPort getServerAuthority()
-    {
-        HttpConfiguration httpConfiguration = getHttpConfiguration();
-        if (httpConfiguration != null)
-            return httpConfiguration.getServerAuthority();
-
-        return null;
-    }
-
     /**
      * <p>Return the Local Port of the connected channel.</p>
      *
@@ -379,9 +367,13 @@ public int getLocalPort()
 
     public InetSocketAddress getLocalAddress()
     {
-        SocketAddress localAddress = getHttpConfiguration().getLocalAddress();
-        if (localAddress instanceof InetSocketAddress)
-            return ((InetSocketAddress)localAddress);
+        HttpConfiguration httpConfiguration = getHttpConfiguration();
+        if (httpConfiguration != null)
+        {
+            SocketAddress localAddress = httpConfiguration.getLocalAddress();
+            if (localAddress instanceof InetSocketAddress)
+                return ((InetSocketAddress)localAddress);
+        }
 
         return _endPoint.getLocalAddress();
     }
@@ -391,6 +383,18 @@ public InetSocketAddress getRemoteAddress()
         return _endPoint.getRemoteAddress();
     }
 
+    /**
+     * @return return the HttpConfiguration server authority override
+     */
+    public HostPort getServerAuthority()
+    {
+        HttpConfiguration httpConfiguration = getHttpConfiguration();
+        if (httpConfiguration != null)
+            return httpConfiguration.getServerAuthority();
+
+        return null;
+    }
+
     /**
      * If the associated response has the Expect header set to 100 Continue,
      * then accessing the input stream indicates that the handler/servlet