Fix #6860 IPv6 Format

updates from review Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Sep 17, 2021 · 316b4bf · 316b4bf
1 parent de46e0a
commit 316b4bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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
@@ -2610,14 +2610,16 @@ private String formatAddrOrHost(String addr)
             return addr;
         if (getContext() == null || getContext().getContextHandler() == null)
             return HostPort.normalizeHost(addr);
-        switch (getContext().getContextHandler().getIpv6Format())
+        switch (getContext().getContextHandler().getIPv6Format())
         {
             case BRACKETED:
                 return HostPort.normalizeHost(addr);
             case UNBRACKETED:
                 return HostPort.denormalizeHost(addr);
-            default:
+            case UNCHANGED:
                 return addr;
+            default:
+                throw new IllegalStateException();
         }
     }
 }
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -189,6 +189,9 @@ public enum ContextStatus
         DESTROYED
     }
 
+    /**
+     * The IPv6 Format to use in the servlet request API
+     */
     public enum IPV6Format
     {
         BRACKETED,
@@ -300,13 +303,13 @@ public Context getServletContext()
         return _scontext;
     }
 
-    @ManagedAttribute("The format of IPv6 addresses return from the servlet API")
-    public IPV6Format getIpv6Format()
+    @ManagedAttribute("The format of IPv6 addresses returned from the servlet API")
+    public IPV6Format getIPv6Format()
     {
         return _ipv6Format;
     }
 
-    public void setIpv6Format(IPV6Format ipv6Format)
+    public void setIPv6Format(IPV6Format ipv6Format)
     {
         _ipv6Format = _ipv6Format;
     }