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 2010/07/06 11:00:28 UTC
svn commit: r960845 - in
/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms:
EndpointMessageListener.java JmsBinding.java
Author: davsclaus
Date: Tue Jul 6 09:00:28 2010
New Revision: 960845
URL: http://svn.apache.org/viewvc?rev=960845&view=rev
Log:
CAMEL-2909: camel-jms now supports OracleAQ which does not support reading the JMSReplyTo header.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=960845&r1=960844&r2=960845&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Tue Jul 6 09:00:28 2010
@@ -315,7 +315,11 @@ public class EndpointMessageListener imp
// lets send a response back if we can
Object destination = getReplyToDestination();
if (destination == null) {
- destination = message.getJMSReplyTo();
+ try {
+ destination = message.getJMSReplyTo();
+ } catch (JMSException e) {
+ LOG.trace("Cannot read JMSReplyTo header. Will ignore this exception.", e);
+ }
}
return destination;
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=960845&r1=960844&r2=960845&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Tue Jul 6 09:00:28 2010
@@ -171,7 +171,12 @@ public class JmsBinding {
map.put("JMSMessageID", jmsMessage.getJMSMessageID());
map.put("JMSPriority", jmsMessage.getJMSPriority());
map.put("JMSRedelivered", jmsMessage.getJMSRedelivered());
- map.put("JMSReplyTo", jmsMessage.getJMSReplyTo());
+ // to work around OracleAQ not supporting the JMSReplyTo header (CAMEL-2909)
+ try {
+ map.put("JMSReplyTo", jmsMessage.getJMSReplyTo());
+ } catch (JMSException e) {
+ LOG.trace("Cannot read JMSReplyTo header. Will ignore this exception.", e);
+ }
map.put("JMSTimestamp", jmsMessage.getJMSTimestamp());
map.put("JMSType", jmsMessage.getJMSType());