Author: davsclaus
Date: Thu Apr 14 09:37:32 2011
New Revision: 1092077
URL: http://svn.apache.org/viewvc?rev=1092077&view=rev
Log:
CAMEL-3859: camel-jms should use default exchange id, instead of overriding and
use JMSMessageID. In fact its discouraged so marked the method as @deprecated.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java?rev=1092077&r1=1092076&r2=1092077&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java Thu Apr
14 09:37:32 2011
@@ -291,6 +291,8 @@ public interface Message {
* of creating one or <tt>null</tt> if not
*
* @return the created exchange id, or <tt>null</tt> if not capable of
creating
+ * @deprecated it is discouraged for messages to create exchange ids
*/
+ @Deprecated
String createExchangeId();
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1092077&r1=1092076&r2=1092077&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Thu Apr 14 09:37:32 2011
@@ -230,19 +230,7 @@ public class JmsMessage extends DefaultM
}
private String getSanitizedString(Object value) {
- return value != null ?
value.toString().replaceAll("[^a-zA-Z0-9\\.\\_\\-]", "_") : "";
- }
-
- @Override
- public String createExchangeId() {
- if (jmsMessage != null) {
- try {
- return jmsMessage.getJMSMessageID();
- } catch (JMSException e) {
- throw new RuntimeExchangeException("Unable to retrieve
JMSMessageID from JMS Message", getExchange(), e);
- }
- }
- return super.createExchangeId();
+ return value != null ?
value.toString().replaceAll("[^a-zA-Z0-9\\:\\.\\_\\-]", "_") : "";
}
}