Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

jetty · Apr 7, 2019 · 90b3a57 · 90b3a57
2 parents c7de2f5 + 3eda169
commit 90b3a57
Showing 1 changed file with 7 additions and 4 deletions.
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
@@ -1618,10 +1618,13 @@ else if (contextPath.length() > 1 && contextPath.endsWith("/"))
 
         if (getServer() != null && (getServer().isStarting() || getServer().isStarted()))
         {
-            ContextHandlerCollection[] contextCollections =
-                    (ContextHandlerCollection[])getServer().getChildHandlersByClass(ContextHandlerCollection.class);
-            for (int h = 0; contextCollections != null && h < contextCollections.length; h++)
-                contextCollections[h].mapContexts();
+            Class<ContextHandlerCollection> handlerClass = ContextHandlerCollection.class;
+            Handler[] contextCollections = getServer().getChildHandlersByClass(handlerClass);
+            if (contextCollections != null)
+            {
+                for (Handler contextCollection : contextCollections)
+                    handlerClass.cast(contextCollection).mapContexts();
+            }
         }
     }