svn commit: r669566 - /activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java

[hadrian]

Author: hadrian
Date: Thu Jun 19 09:57:19 2008
New Revision: 669566

URL: http://svn.apache.org/viewvc?rev=669566&view=rev
Log:
fix CAMEL-618

Modified:
    
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java

Modified: 
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=669566&r1=669565&r2=669566&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
 (original)
+++ 
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
 Thu Jun 19 09:57:19 2008
@@ -168,7 +168,7 @@
             } else if (headerName.equals("JMSCorrelationID")) {
                 
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, 
String.class,
                                                                             
headerValue));
-            } else if (headerName.equals("JMSReplyTo")) {
+            } else if (headerName.equals("JMSReplyTo") && headerValue != null) 
{
                 
jmsMessage.setJMSReplyTo(ExchangeHelper.convertToType(exchange, 
Destination.class,
                                                                       
headerValue));
             } else if (headerName.equals("JMSType")) {
@@ -278,8 +278,10 @@
     protected void populateIgnoreJmsHeaders(Set<String> set) {
         // ignore provider specified JMS extension headers
         // see page 39 of JMS 1.1 specification
+        //
+        // added "JMSXRecvTimestamp" as a workaround for an Oracle bug/typo in 
AqjmsMessage
         String[] ignore = {"JMSXUserID", "JMSXAppID", "JMSXDeliveryCount", 
"JMSXProducerTXID",
-                           "JMSXConsumerTXID", "JMSXRcvTimestamp", 
"JMSXState"};
+                           "JMSXConsumerTXID", "JMSXRcvTimestamp", 
"JMSXRecvTimestamp", "JMSXState"};
         set.addAll(Arrays.asList(ignore));
     }
 }