(camel) 01/02: CAMEL-21663: fix NPE hurting sjms/sjms2 performance

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5e3074215a60a97b511abca9d6b195f30db3edd1
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Jan 27 14:28:50 2025 +0100

    CAMEL-21663: fix NPE hurting sjms/sjms2 performance
---
 .../org/apache/camel/component/sjms/jms/JmsMessageHelper.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index 1d67dad7c23..e2495c83dc9 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -321,6 +321,10 @@ public final class JmsMessageHelper {
      * @return         <tt>true</tt> if redelivered, <tt>false</tt> if not, 
<tt>null</tt> if not able to determine
      */
     public static Boolean getJMSRedelivered(Message message) {
+        if (message == null) {
+            return null;
+        }
+
         try {
             return message.getJMSRedelivered();
         } catch (Exception e) {
@@ -432,7 +436,12 @@ public final class JmsMessageHelper {
      */
     public static String getJMSCorrelationIDAsBytes(Message message) {
         try {
-            return new String(message.getJMSCorrelationIDAsBytes());
+            final byte[] jmsCorrelationIDAsBytes = 
message.getJMSCorrelationIDAsBytes();
+            if (jmsCorrelationIDAsBytes != null) {
+                return new String(jmsCorrelationIDAsBytes);
+            }
+
+            return null;
         } catch (Exception e) {
             // ignore if JMS broker do not support this
         }