Fix NPE in rmi server instrumentation (open-telemetry#5042)

RashmiRam · May 23, 2022 · a089ffc · a089ffc
1 parent b37d323
commit a089ffc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java b/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java
@@ -57,6 +57,9 @@ public static void onEnter(
 
  // TODO review and unify with all other SERVER instrumentation
  Context parentContext = THREAD_LOCAL_CONTEXT.getAndResetContext();
+ if (parentContext == null) {
+ return;
+ }
  request = ClassAndMethod.create(declaringClass, methodName);
  if (!instrumenter().shouldStart(parentContext, request)) {
  return;