You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/12/15 15:58:01 UTC

svn commit: r487576 - /incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java

Author: gnodet
Date: Fri Dec 15 06:58:00 2006
New Revision: 487576

URL: http://svn.apache.org/viewvc?view=rev&rev=487576
Log:
SM-780: Bug due to change in proxy support for http binding component
Thanks to Martin Landua for this patch !

Modified:
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java

Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java?view=diff&rev=487576&r1=487575&r2=487576
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java Fri Dec 15 06:58:00 2006
@@ -260,11 +260,11 @@
             if ((endpoint.getProxy().getProxyHost() != null) && (endpoint.getProxy().getProxyPort() != 0)) {
                 host.setProxy(endpoint.getProxy().getProxyHost(), endpoint.getProxy().getProxyPort());
             }
+            if (endpoint.getProxy().getProxyCredentials() != null) {
+                endpoint.getProxy().getProxyCredentials().applyProxyCredentials(getClient());
+            }
         } else if ((getConfiguration().getProxyHost() != null) && (getConfiguration().getProxyPort() != 0)) {
             host.setProxy(getConfiguration().getProxyHost(), getConfiguration().getProxyPort());
-        }
-        if (endpoint.getProxy().getProxyCredentials() != null) {
-            endpoint.getProxy().getProxyCredentials().applyProxyCredentials(getClient());
         }
         return host;
     }