svn commit: r792381 - in /camel/trunk/components/camel-http/src: main/java/org/apache/camel/component/http/HttpProducer.java test/java/org/apache/camel/component/http/HttpGetTest.java test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java

[ningjiang]

Author: ningjiang
Date: Thu Jul  9 02:21:24 2009
New Revision: 792381

URL: http://svn.apache.org/viewvc?rev=792381&view=rev
Log:
CAMEL-1813 fixed the issue of message header copy

Modified:
    
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
    
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
    
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java

Modified: 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=792381&r1=792380&r2=792381&view=diff
==============================================================================
--- 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
 (original)
+++ 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
 Thu Jul  9 02:21:24 2009
@@ -97,7 +97,7 @@
     protected void populateResponse(Exchange exchange, HttpMethod method, 
Message in, HeaderFilterStrategy strategy, int responseCode) throws IOException 
{
         Message answer = exchange.getOut();
 
-        //answer.setHeaders(in.getHeaders());
+        answer.setHeaders(in.getHeaders());
         answer.setHeader(Exchange.HTTP_RESPONSE_CODE, responseCode);
         answer.setBody(extractResponseBody(method, exchange));
 

Modified: 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java?rev=792381&r1=792380&r2=792381&view=diff
==============================================================================
--- 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
 (original)
+++ 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
 Thu Jul  9 02:21:24 2009
@@ -32,7 +32,7 @@
  */
 public class HttpGetTest extends CamelTestSupport {
     protected String expectedText = "activemq";
-
+    
     @Test
     public void testHttpGet() throws Exception {
         MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:results", 
MockEndpoint.class);
@@ -51,7 +51,7 @@
         Map<String, Object> headers = in.getHeaders();
 
         log.debug("Headers: " + headers);
-        assertTrue("Should be more than one header but was: " + headers, 
headers.size() > 0);
+        checkHeaders(headers);       
 
         String body = in.getBody(String.class);
 
@@ -60,6 +60,11 @@
         assertTrue("body should contain: " + expectedText, 
body.contains(expectedText));
     }
 
+    protected void checkHeaders(Map<String, Object> headers) {
+        assertTrue("Should be more than one header but was: " + headers, 
headers.size() > 0);
+        
+    }
+
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {

Modified: 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java?rev=792381&r1=792380&r2=792381&view=diff
==============================================================================
--- 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
 (original)
+++ 
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetWithHeadersTest.java
 Thu Jul  9 02:21:24 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.http;
 
+import java.util.Map;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Before;
 
@@ -26,6 +28,7 @@
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
+                    .setHeader("TestHeader", constant("test"))
                     .setHeader("Content-Length", constant(0))
                     .setHeader("Accept-Language", constant("pl"))
                     .to("http://www.google.com/search";)
@@ -41,5 +44,10 @@
         expectedText = "Szukaj";
         super.setUp();
     }
+    
+    protected void checkHeaders(Map<String, Object> headers) {
+        assertTrue("Should be more than one header but was: " + headers, 
headers.size() > 0);
+        assertEquals("Should get the TestHeader", "test", 
headers.get("TestHeader"));
+    }
 
 }