From 800ce34dd282e734b10f9c435432860dcb64ab2c Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 23 Aug 2024 08:50:36 -0500 Subject: [PATCH] Handle when servlet mapping is null --- .../src/io/openliberty/http/monitor/Servlet4Helper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/io.openliberty.http.monitor/src/io/openliberty/http/monitor/Servlet4Helper.java b/dev/io.openliberty.http.monitor/src/io/openliberty/http/monitor/Servlet4Helper.java index 9f7fe8702c55..b10cb6e12b8d 100644 --- a/dev/io.openliberty.http.monitor/src/io/openliberty/http/monitor/Servlet4Helper.java +++ b/dev/io.openliberty.http.monitor/src/io/openliberty/http/monitor/Servlet4Helper.java @@ -9,6 +9,8 @@ *******************************************************************************/ package io.openliberty.http.monitor; +import javax.servlet.http.HttpServletMapping; + import com.ibm.ws.ffdc.annotation.FFDCIgnore; import com.ibm.ws.webcontainer40.osgi.webapp.WebAppDispatcherContext40; import com.ibm.wsspi.webcontainer.webapp.IWebAppDispatcherContext; @@ -24,7 +26,8 @@ public static String getPattern(IWebAppDispatcherContext webAppdispatcherContext if (isServlet4Up) { if (webAppdispatcherContext instanceof WebAppDispatcherContext40) { WebAppDispatcherContext40 webAppDispatcherContext40 = (WebAppDispatcherContext40) webAppdispatcherContext; - return webAppDispatcherContext40.getServletMapping().getPattern(); + HttpServletMapping mapping = webAppDispatcherContext40.getServletMapping(); + return mapping == null ? null : mapping.getPattern(); } return null; } else { @@ -44,7 +47,8 @@ public static String getMatchValue(IWebAppDispatcherContext webAppdispatcherCont if (isServlet4Up) { if (webAppdispatcherContext instanceof WebAppDispatcherContext40) { WebAppDispatcherContext40 webAppDispatcherContext40 = (WebAppDispatcherContext40) webAppdispatcherContext; - return webAppDispatcherContext40.getServletMapping().getMatchValue(); + HttpServletMapping mapping = webAppDispatcherContext40.getServletMapping(); + return mapping == null ? null : mapping.getMatchValue(); } return null; } else {