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 2015/03/15 12:40:05 UTC
[1/2] camel git commit: CAMEL-8489: camel-sjms - allow null body
option.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 52dfc90e5 -> 275d2e70e
refs/heads/master 5804f4880 -> 2b5607028
CAMEL-8489: camel-sjms - allow null body option.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b560702
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b560702
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b560702
Branch: refs/heads/master
Commit: 2b56070283380f75e574ee0d35d9da1e29ee5bc1
Parents: 5804f48
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 12:38:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 12:38:31 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/sjms/jms/JmsMessageHelper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2b560702/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
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 81091d6..f065bbe 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
@@ -47,6 +47,7 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.component.sjms.SjmsConstants;
import org.apache.camel.component.sjms.SjmsEndpoint;
import org.apache.camel.impl.DefaultMessage;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,6 +199,8 @@ public final class JmsMessageHelper implements JmsConstants {
case Message:
if (allowNullBody && payload == null) {
answer = session.createMessage();
+ } else if (payload != null) {
+ throw new JMSException("Unsupported message body type " + ObjectHelper.classCanonicalName(payload));
} else {
throw new JMSException("Null body is not allowed");
}
[2/2] camel git commit: CAMEL-8489: camel-sjms - allow null body
option.
Posted by da...@apache.org.
CAMEL-8489: camel-sjms - allow null body option.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/275d2e70
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/275d2e70
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/275d2e70
Branch: refs/heads/camel-2.15.x
Commit: 275d2e70ed83875b89439d7b420526afef15ea6f
Parents: 52dfc90
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 15 12:38:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 15 12:41:44 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/sjms/jms/JmsMessageHelper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/275d2e70/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
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 81091d6..f065bbe 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
@@ -47,6 +47,7 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.component.sjms.SjmsConstants;
import org.apache.camel.component.sjms.SjmsEndpoint;
import org.apache.camel.impl.DefaultMessage;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,6 +199,8 @@ public final class JmsMessageHelper implements JmsConstants {
case Message:
if (allowNullBody && payload == null) {
answer = session.createMessage();
+ } else if (payload != null) {
+ throw new JMSException("Unsupported message body type " + ObjectHelper.classCanonicalName(payload));
} else {
throw new JMSException("Null body is not allowed");
}