Merge pull request #1636 from newrelic/servlet-init-null-check

Null checks on ServletContext in servlet instrumentation modules.

Author: jtduffy

instrumentation/servlet-2.4/src/main/java/javax/servlet/Servlet_Instrumentation.java

@@ -25,7 +25,10 @@ public abstract class Servlet_Instrumentation {
 
     @Trace(dispatcher = true)
     public void init(ServletConfig config) {
-        AgentBridge.privateApi.setServerInfo(config.getServletContext().getServerInfo());
+        ServletContext ctx = config.getServletContext();
+        if (ctx != null && ctx.getServerInfo() != null) {
+            AgentBridge.privateApi.setServerInfo(ctx.getServerInfo());
+        }
 
         Weaver.callOriginal();
     }

instrumentation/servlet-5.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java

@@ -25,7 +25,10 @@ public abstract class Servlet_Instrumentation {
 
     @Trace(dispatcher = true)
     public void init(ServletConfig config) {
-        AgentBridge.privateApi.setServerInfo(config.getServletContext().getServerInfo());
+        ServletContext ctx = config.getServletContext();
+        if (ctx != null && ctx.getServerInfo() != null) {
+            AgentBridge.privateApi.setServerInfo(ctx.getServerInfo());
+        }
 
         Weaver.callOriginal();
     }

instrumentation/servlet-6.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java

@@ -24,7 +24,10 @@ public abstract class Servlet_Instrumentation {
 
     @Trace(dispatcher = true)
     public void init(ServletConfig config) {
-        AgentBridge.privateApi.setServerInfo(config.getServletContext().getServerInfo());
+        ServletContext ctx = config.getServletContext();
+        if (ctx != null && ctx.getServerInfo() != null) {
+            AgentBridge.privateApi.setServerInfo(ctx.getServerInfo());
+        }
 
         Weaver.callOriginal();
     }