Author: davsclaus
Date: Tue Mar 24 11:11:40 2009
New Revision: 757728
URL: http://svn.apache.org/viewvc?rev=757728&view=rev
Log:
Merged revisions 757693 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r757693 | davsclaus | 2009-03-24 10:36:29 +0100 (Tue, 24 Mar 2009) | 1 line
CAMEL-1461: JMSProducer only sets JMSReplyTo if exchange is out capable.
Fixed a NPE.
........
Added:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
- copied unchanged from r757693,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/ (props
changed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 11:11:40 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,757636,757693
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=757728&r1=757727&r2=757728&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Tue Mar 24 11:11:40 2009
@@ -227,8 +227,13 @@
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange,
String.class,
headerValue));
} else if (headerName.equals("JMSReplyTo") && headerValue != null)
{
-
jmsMessage.setJMSReplyTo(ExchangeHelper.convertToType(exchange,
Destination.class,
- headerValue));
+ if (exchange.getPattern().isOutCapable()) {
+ // only set the JMSReply if the Exchange supports Out
+
jmsMessage.setJMSReplyTo(ExchangeHelper.convertToType(exchange,
Destination.class, headerValue));
+ } else {
+ // warn we got a JMSReplyTo but the Exchange is not out
capable
+ LOG.warn("Exchange is not out capable, Ignoring
JMSReplyTo: " + headerValue);
+ }
} else if (headerName.equals("JMSType")) {
jmsMessage.setJMSType(ExchangeHelper.convertToType(exchange,
String.class, headerValue));
} else if (LOG.isDebugEnabled()) {
Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 11:11:40 2009
@@ -0,0 +1 @@
+/camel/trunk/components/camel-xmpp/src/test/resources:757693
