Fix possible NPE for default servlet (#234)

Signed-off-by: Olivier Lamy <[email protected]>
arquillian · Jan 24, 2025 · 37fa23f · 37fa23f
1 parent e1787dd
commit 37fa23f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/...rc/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java b/...rc/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java
@@ -262,7 +262,11 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort);
             ServletHandler servletHandler = webAppContext.getServletHandler();
             for (ServletHolder servlet : servletHandler.getServlets()) {
-                httpContext.add(new Servlet(servlet.getName(), servlet.getContextPath()));
+                if(servlet.getServletContext() == null) {
+                    httpContext.add(new Servlet(servlet.getName(), "/"));
+                } else {
+                    httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                }
             }
             return new ProtocolMetaData().addContext(httpContext);
         } catch (Exception e) {

diff --git a/...rc/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java b/...rc/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java
@@ -264,7 +264,11 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort);
             ServletHandler servletHandler = webAppContext.getServletHandler();
             for (ServletHolder servlet : servletHandler.getServlets()) {
-                httpContext.add(new Servlet(servlet.getName(), servlet.getContextPath()));
+                if(servlet.getServletContext() == null) {
+                    httpContext.add(new Servlet(servlet.getName(), "/"));
+                } else {
+                    httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                }
             }
             return new ProtocolMetaData().addContext(httpContext);
         } catch (Exception e) {

diff --git a/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java b/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java
@@ -277,7 +277,11 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort);
             ServletHandler servletHandler = webAppContext.getServletHandler();
             for (ServletHolder servlet : servletHandler.getServlets()) {
-                httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                if(servlet.getServletContext() == null) {
+                    httpContext.add(new Servlet(servlet.getName(), "/"));
+                } else {
+                    httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                }
             }
             return new ProtocolMetaData().addContext(httpContext);
         } catch (Exception e) {

diff --git a/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java b/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java
@@ -277,7 +277,11 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort);
             ServletHandler servletHandler = webAppContext.getServletHandler();
             for (ServletHolder servlet : servletHandler.getServlets()) {
-                httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                if(servlet.getServletContext() == null) {
+                    httpContext.add(new Servlet(servlet.getName(), "/"));
+                } else {
+                    httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
+                }
             }
             return new ProtocolMetaData().addContext(httpContext);
         } catch (Exception e) {

diff --git a/...ain/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java b/...ain/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java
@@ -277,10 +277,11 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort);
             ServletHandler servletHandler = webAppContext.getServletHandler();
             for (ServletHolder servlet : servletHandler.getServlets()) {
-                if(servlet.getServletContext() != null) {
+                if(servlet.getServletContext() == null) {
+                    httpContext.add(new Servlet(servlet.getName(), "/"));
+                } else {
                     httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath()));
                 }
-
             }
             return new ProtocolMetaData().addContext(httpContext);
         } catch (Exception e) {