Avoid NPE on tomcat classloading instrumentation (#10256)

amarziali · web-flow · commit e5c8728a3a4f · 2025-12-19T14:33:36.000+01:00
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/src/main/java/datadog/trace/instrumentation/tomcat9/WebappClassLoaderInstrumentation.java
@@ -41,7 +41,7 @@ public static void onContextAvailable(
         @Advice.This final WebappClassLoaderBase classLoader,
         @Advice.Argument(0) final WebResourceRoot webResourceRoot) {
       // at this moment we have the context set in this classloader, hence its name
-      final Context context = webResourceRoot.getContext();
+      final Context context = webResourceRoot != null ? webResourceRoot.getContext() : null;
       if (context == null) {
         return;
       }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static void onContextAvailable(`
`41`	`41`	`@Advice.This final WebappClassLoaderBase classLoader,`
`42`	`42`	`@Advice.Argument(0) final WebResourceRoot webResourceRoot) {`
`43`	`43`	`// at this moment we have the context set in this classloader, hence its name`
`44`		`- final Context context = webResourceRoot.getContext();`
	`44`	`+ final Context context = webResourceRoot != null ? webResourceRoot.getContext() : null;`
`45`	`45`	`if (context == null) {`
`46`	`46`	`return;`
`47`	`47`	`}`