Author: davsclaus
Date: Wed Sep 21 15:52:05 2011
New Revision: 1173736
URL: http://svn.apache.org/viewvc?rev=1173736&view=rev
Log:
Merged revisions 1173732 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
svn:mergeinfo = /camel/trunk:1173732
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java?rev=1173736&r1=1173735&r2=1173736&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
Wed Sep 21 15:52:05 2011
@@ -43,8 +43,10 @@ public class HazelcastComponentHelper {
headers.remove(HazelcastConstants.OPERATION);
}
- // set out headers
- ex.getOut().setHeaders(headers);
+ // propagate headers if OUT message created
+ if (ex.hasOut()) {
+ ex.getOut().setHeaders(headers);
+ }
}
public static void setListenerHeaders(Exchange ex, String listenerType,
String listenerAction, String cacheName) {
