Merge pull request #29474 from tjwatson/fixHttpMonitorCheckpoint

Fix http monitor checkpoint
OpenLiberty · Aug 24, 2024 · ed7a428 · ed7a428
2 parents 6e7be7c + 800ce34
commit ed7a428
Showing 1 changed file with 6 additions and 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
@@ -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 {