Author: davsclaus
Date: Wed Aug 27 12:21:35 2008
New Revision: 689577
URL: http://svn.apache.org/viewvc?rev=689577&view=rev
Log:
CAMEL-850: camel-mina should preserver headers. Added missing svn:ignore to
folders
Modified:
activemq/camel/trunk/components/camel-ldap/ (props changed)
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
activemq/camel/trunk/tooling/archetypes/camel-archetype-activemq/ (props
changed)
activemq/camel/trunk/tooling/archetypes/camel-archetype-spring/ (props
changed)
Propchange: activemq/camel/trunk/components/camel-ldap/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 27 12:21:35 2008
@@ -0,0 +1,8 @@
+target
+.pmd
+.checkstyle
+.classpath
+.project
+eclipse-classes
+.settings
+*.i??
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java?rev=689577&r1=689576&r2=689577&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
(original)
+++
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
Wed Aug 27 12:21:35 2008
@@ -66,7 +66,8 @@
if (payload instanceof MinaPayloadHolder) {
MinaPayloadHolder.unmarshal(exchange, (MinaPayloadHolder) payload);
} else {
- // normal transfer using the body only
+ // normal transfer using the body only and preserve the headers
+ exchange.getOut().setHeaders(exchange.getIn().getHeaders());
exchange.getOut().setBody(payload);
}
}
Propchange: activemq/camel/trunk/tooling/archetypes/camel-archetype-activemq/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 27 12:21:35 2008
@@ -0,0 +1,8 @@
+target
+.pmd
+.checkstyle
+.classpath
+.project
+eclipse-classes
+.settings
+*.i??
Propchange: activemq/camel/trunk/tooling/archetypes/camel-archetype-spring/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 27 12:21:35 2008
@@ -0,0 +1,8 @@
+target
+.pmd
+.checkstyle
+.classpath
+.project
+eclipse-classes
+.settings
+*.i??
