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 2008/11/06 21:47:59 UTC
svn commit: r711972 - in /activemq/camel/branches/camel-1.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Author: davsclaus
Date: Thu Nov 6 12:47:51 2008
New Revision: 711972
URL: http://svn.apache.org/viewvc?rev=711972&view=rev
Log:
Merged revisions 711971 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r711971 | davsclaus | 2008-11-06 21:42:08 +0100 (to, 06 nov 2008) | 1 line
Marked a not used class @deprecated. Removed if .. else that was the same code.
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 6 12:47:51 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 6 12:47:51 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java?rev=711972&r1=711971&r2=711972&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java Thu Nov 6 12:47:51 2008
@@ -19,6 +19,7 @@
/**
* A processor which is capable of transforming the
*
+ * @deprecated not used. Will be removed in Camel 2.0
* @version $Revision$
*/
public class DestinationTransformProcessor {
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=711972&r1=711971&r2=711972&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Thu Nov 6 12:47:51 2008
@@ -226,9 +226,6 @@
if (headerName.equals("JMSCorrelationID")) {
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, String.class,
headerValue));
- } else if (headerName.equals("JMSCorrelationID")) {
- jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, String.class,
- headerValue));
} else if (headerName.equals("JMSReplyTo") && headerValue != null) {
jmsMessage.setJMSReplyTo(ExchangeHelper.convertToType(exchange, Destination.class,
headerValue));