You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/09/28 06:04:23 UTC
svn commit: r699768 -
/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Author: ningjiang
Date: Sat Sep 27 21:04:22 2008
New Revision: 699768
URL: http://svn.apache.org/viewvc?rev=699768&view=rev
Log:
CAMEL-942 Fixed the test failure of FileRouteToJMSTest
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=699768&r1=699767&r2=699768&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 Sat Sep 27 21:04:22 2008
@@ -216,7 +216,6 @@
for (Map.Entry<String, Object> entry : entries) {
String headerName = entry.getKey();
Object headerValue = entry.getValue();
-
appendJmsProperty(jmsMessage, exchange, in, headerName, headerValue);
}
}
@@ -246,12 +245,11 @@
} else if (shouldOutputHeader(in, headerName, headerValue)) {
// must encode to safe JMS header name before setting property on jmsMessage
String key = encodeToSafeJmsHeaderName(headerName);
-
// only primitive headers and strings is allowed as properties
// see message properties: http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html
Object value = getValidJMSHeaderValue(headerName, headerValue);
if (value != null) {
- jmsMessage.setObjectProperty(key, headerValue);
+ jmsMessage.setObjectProperty(key, value);
} else if (LOG.isDebugEnabled()) {
// okay the value is not a primitive or string so we can not sent it over the wire
LOG.debug("Ignoring non primitive header: " + headerName + " of class: "
@@ -295,7 +293,6 @@
} else if (headerValue instanceof Date) {
return headerValue.toString();
}
-
return null;
}