svn commit: r1214175 - in /camel/branches/camel-2.8.x: ./ components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/

[davsclaus]

Author: davsclaus
Date: Wed Dec 14 11:34:55 2011
New Revision: 1214175

URL: http://svn.apache.org/viewvc?rev=1214175&view=rev
Log:
[CAMEL-4776] Modified Hazelcast helper method to properly add the headers & 
body to the in message.

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
    
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 11:34:55 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132

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=1214175&r1=1214174&r2=1214175&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 Dec 14 11:34:55 2011
@@ -50,14 +50,14 @@ public class HazelcastComponentHelper {
     }
 
     public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction, String cacheName) {
-        ex.getOut().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
+        ex.getIn().setHeader(HazelcastConstants.CACHE_NAME, cacheName);
         HazelcastComponentHelper.setListenerHeaders(ex, listenerType, 
listenerAction);
     }
 
     public static void setListenerHeaders(Exchange ex, String listenerType, 
String listenerAction) {
-        ex.getOut().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
-        ex.getOut().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
-        ex.getOut().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
+        ex.getIn().setHeader(HazelcastConstants.LISTENER_ACTION, 
listenerAction);
+        ex.getIn().setHeader(HazelcastConstants.LISTENER_TYPE, listenerType);
+        ex.getIn().setHeader(HazelcastConstants.LISTENER_TIME, new 
Date().getTime());
     }
 
     /**

Modified: 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java?rev=1214175&r1=1214174&r2=1214175&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java
 Wed Dec 14 11:34:55 2011
@@ -36,11 +36,11 @@ public class CamelListener {
         Exchange exchange = consumer.getEndpoint().createExchange();
 
         // set object to body
-        exchange.getOut().setBody(value);
+        exchange.getIn().setBody(value);
 
         // set headers
         if (key != null) {
-            exchange.getOut().setHeader(HazelcastConstants.OBJECT_ID, key);
+            exchange.getIn().setHeader(HazelcastConstants.OBJECT_ID, key);
         }
 
         HazelcastComponentHelper.setListenerHeaders(exchange, 
HazelcastConstants.CACHE_LISTENER, operation, cacheName);