You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/04/12 10:24:47 UTC

svn commit: r933139 - in /camel/trunk/components/camel-http/src: main/java/org/apache/camel/component/http/HttpComponent.java test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java

Author: ningjiang
Date: Mon Apr 12 08:24:46 2010
New Revision: 933139

URL: http://svn.apache.org/viewvc?rev=933139&view=rev
Log:
CAMEL-2634 merged the revision 924849 into camel-http

Added:
    camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java
      - copied unchanged from r924849, camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java
Modified:
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=933139&r1=933138&r2=933139&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Mon Apr 12 08:24:46 2010
@@ -68,12 +68,16 @@ public class HttpComponent extends Heade
      */
     protected void configureParameters(Map<String, Object> parameters) {
         // lookup http binding in registry if provided
-        httpBinding = resolveAndRemoveReferenceParameter(
-                parameters, "httpBindingRef", HttpBinding.class);
+        if ( httpBinding == null ) {
+            httpBinding = resolveAndRemoveReferenceParameter(
+                    parameters, "httpBindingRef", HttpBinding.class);
+        }
         
         // lookup http client front configurer in the registry if provided
-        httpClientConfigurer = resolveAndRemoveReferenceParameter(
-                parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
+        if ( httpClientConfigurer == null ) {
+            httpClientConfigurer = resolveAndRemoveReferenceParameter(
+                    parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
+        }
         
         // check the user name and password for basic authentication
         String username = getAndRemoveParameter(parameters, "username", String.class);