Author: davsclaus
Date: Mon Jun 4 10:16:31 2012
New Revision: 1345908
URL: http://svn.apache.org/viewvc?rev=1345908&view=rev
Log:
CAMEL-5329: restlet producer should presever headers like the other http
components.
Added:
camel/branches/camel-2.9.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
- copied unchanged from r1345906,
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1345906
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=1345908&r1=1345907&r2=1345908&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Mon Jun 4 10:16:31 2012
@@ -31,6 +31,7 @@ import org.apache.camel.WrappedFile;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.util.MessageHelper;
import org.restlet.Request;
import org.restlet.Response;
import org.restlet.data.ChallengeResponse;
@@ -265,6 +266,10 @@ public class DefaultRestletBinding imple
LOG.debug("Populate exchange from Restlet response: {}", text);
exchange.getOut().setBody(text);
}
+
+ // preserve headers from in by copying any non existing headers
+ // to avoid overriding existing headers with old values
+ MessageHelper.copyHeaders(exchange.getIn(), exchange.getOut(), false);
}
public HeaderFilterStrategy getHeaderFilterStrategy() {