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

Null checks on ServletContext in servlet instrumentation modules.
newrelic · Dec 6, 2023 · 9f144fd · 9f144fd
2 parents a4feb9d + 07d77c7
commit 9f144fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/instrumentation/servlet-2.4/src/main/java/javax/servlet/Servlet_Instrumentation.java b/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();
  }

diff --git a/instrumentation/servlet-5.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java b/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();
  }

diff --git a/instrumentation/servlet-6.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java b/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();
  }