Author: davsclaus
Date: Tue Nov  6 10:29:47 2012
New Revision: 1406086

URL: http://svn.apache.org/viewvc?rev=1406086&view=rev
Log:
CAMEL-5390: Option to assign unique correlation ID to JMS messages. Fixed.

Added:
    
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java
      - copied unchanged from r1387808, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java
    
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java
      - copied unchanged from r1387808, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java
Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1387808

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1406086&r1=1406085&r2=1406086&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
 Tue Nov  6 10:29:47 2012
@@ -51,6 +51,7 @@ import static org.apache.camel.component
  */
 public class JmsProducer extends DefaultAsyncProducer {
     private static final transient Logger LOG = 
LoggerFactory.getLogger(JmsProducer.class);
+    private static final String GENERATED_CORRELATION_ID_PREFIX = "Camel-";
     private final JmsEndpoint endpoint;
     private final AtomicBoolean started = new AtomicBoolean(false);
     private JmsOperations inOnlyTemplate;
@@ -173,10 +174,13 @@ public class JmsProducer extends Default
         }
 
         final String originalCorrelationId = in.getHeader("JMSCorrelationID", 
String.class);
-        if (ObjectHelper.isEmpty(originalCorrelationId) && !msgIdAsCorrId) {
-            in.setHeader("JMSCorrelationID", 
getUuidGenerator().generateUuid());
+        boolean generateFreshCorrId = 
(ObjectHelper.isEmpty(originalCorrelationId) && !msgIdAsCorrId) 
+                || (originalCorrelationId != null && 
originalCorrelationId.startsWith(GENERATED_CORRELATION_ID_PREFIX));
+        if (generateFreshCorrId) {
+            // we append the 'Camel-' prefix to know it was generated by us
+            in.setHeader("JMSCorrelationID", GENERATED_CORRELATION_ID_PREFIX + 
getUuidGenerator().generateUuid());
         }
-
+        
         MessageCreator messageCreator = new MessageCreator() {
             public Message createMessage(Session session) throws JMSException {
                 Message answer = 
endpoint.getBinding().makeJmsMessage(exchange, in, session, null);


Reply via email to