From 55e723e810e1cb82b8c423a943fdeb702dcbfb85 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 13 Jun 2024 09:54:14 +0300
Subject: [PATCH] Avoid NullPointerException when jms destination is not
 available (#11570)

---
 .../instrumentation/jms/MessageWithDestination.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageWithDestination.java b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageWithDestination.java
index d394a77427..1c55fc693e 100644
--- a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageWithDestination.java
+++ b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageWithDestination.java
@@ -31,11 +31,13 @@ public abstract class MessageWithDestination {
       jmsDestination = fallbackDestination;
     }
 
-    if (jmsDestination.isQueue()) {
-      return createMessageWithQueue(message, jmsDestination);
-    }
-    if (jmsDestination.isTopic()) {
-      return createMessageWithTopic(message, jmsDestination);
+    if (jmsDestination != null) {
+      if (jmsDestination.isQueue()) {
+        return createMessageWithQueue(message, jmsDestination);
+      }
+      if (jmsDestination.isTopic()) {
+        return createMessageWithTopic(message, jmsDestination);
+      }
     }
     return new AutoValue_MessageWithDestination(
         message, "unknown", /* isTemporaryDestination= */ false);