You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/10/14 13:53:14 UTC
[3/6] camel git commit: CAMEL-10387 - Return null if the byte array
contains only 0x0 values
CAMEL-10387 - Return null if the byte array contains only 0x0 values
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50921c13
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50921c13
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50921c13
Branch: refs/heads/camel-2.18.x
Commit: 50921c137195acbf65112fe2a50767f5e0be6f00
Parents: b119672
Author: Guillaume Terral <Gu...@murex.com>
Authored: Fri Oct 14 13:45:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 14 15:52:11 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/jms/JmsMessageHelper.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/50921c13/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index 5788662..dbfd815 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -38,7 +38,7 @@ import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
/**
* Utility class for {@link javax.jms.Message}.
*
- * @version
+ * @version
*/
public final class JmsMessageHelper {
@@ -300,7 +300,7 @@ public final class JmsMessageHelper {
return null;
}
-
+
/**
* Gets the String Properties from the message.
*
@@ -413,11 +413,15 @@ public final class JmsMessageHelper {
*/
public static String getJMSCorrelationIDAsBytes(Message message) {
try {
- return new String(message.getJMSCorrelationIDAsBytes());
+ byte[] bytes = message.getJMSCorrelationIDAsBytes();
+ boolean isNull = true;
+ for(byte b : bytes)
+ if(b != 0)
+ isNull = false;
+ return isNull ? null : new String(message.getJMSCorrelationIDAsBytes());
} catch (Exception e) {
// ignore if JMS broker do not support this
}
-
return null;
}
}