You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/06/04 12:18:37 UTC
svn commit: r1345909 - in /camel/branches/camel-2.8.x: ./
components/camel-restlet/src/main/java/org/apache/camel/component/restlet/
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
Author: davsclaus
Date: Mon Jun 4 10:18:37 2012
New Revision: 1345909
URL: http://svn.apache.org/viewvc?rev=1345909&view=rev
Log:
CAMEL-5329: restlet producer should presever headers like the other http components.
Added:
camel/branches/camel-2.8.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
- copied unchanged from r1345908, camel/branches/camel-2.9.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerPropagateHeadersTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1345906
Merged /camel/branches/camel-2.9.x:r1345908
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=1345909&r1=1345908&r2=1345909&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java (original)
+++ camel/branches/camel-2.8.x/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java Mon Jun 4 10:18:37 2012
@@ -29,6 +29,7 @@ import org.apache.camel.component.file.G
import org.apache.camel.converter.jaxp.StringSource;
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;
@@ -256,6 +257,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() {