Fix NPE during ContextHandler.toString() on vhosts

jetty · Jan 24, 2024 · d92230d · d92230d
1 parent a1e0e04
commit d92230d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -388,6 +388,8 @@ public void removeVirtualHosts(String... virtualHosts)
     @ManagedAttribute(value = "Virtual hosts accepted by the context", readonly = true)
     public List<String> getVirtualHosts()
     {
+        if (_vhosts == null)
+            return null;
         return _vhosts.stream().map(VHost::getName).collect(Collectors.toList());
     }
 
@@ -1040,7 +1042,7 @@ public String toString()
         b.append(",b=").append(getBaseResource());
         b.append(",a=").append(_availability.get());
 
-        if (!vhosts.isEmpty())
+        if (vhosts != null && !vhosts.isEmpty())
         {
             b.append(",vh=[");
             b.append(String.join(",", vhosts));