From d5bd3cb91b7a2e17e2aad1650add72d421d9339f Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Fri, 7 Jan 2022 21:47:23 +0200
Subject: [PATCH] Fix NPE in rmi server instrumentation (#5042)

---
 .../rmi/server/RemoteServerInstrumentation.java                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java
index 2252b38acd37..ec90604981c2 100644
--- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java
+++ b/instrumentation/rmi/javaagent/src/main/java/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;