camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1457824 - in /camel/branches/camel-2.10.x: ./ components/camel-http/src/main/java/org/apache/camel/component/http/ components/camel-http4/src/main/java/org/apache/camel/component/http4/ components/camel-jetty/src/main/java/org/apache/camel...
Date Mon, 18 Mar 2013 15:45:08 GMT
Author: davsclaus
Date: Mon Mar 18 15:45:08 2013
New Revision: 1457824

URL: http://svn.apache.org/r1457824
Log:
CAMEL-6173: Fixed potential double values in http request parameters if bridging endpoint
and client calls with a request parameter that has url decoded value in it.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
    camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
    camel/branches/camel-2.10.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1457823

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1457824&r1=1457823&r2=1457824&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
(original)
+++ camel/branches/camel-2.10.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Mon Mar 18 15:45:08 2013
@@ -119,10 +119,7 @@ public class HttpProducer extends Defaul
                     // we should not add headers for the parameters in the uri if we bridge
the endpoint
                     // as then we would duplicate headers on both the endpoint uri, and in
HTTP headers as well
                     if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key))
{
-                        Object skipValue = skipRequestHeaders.get(key);
-                        if (ObjectHelper.equal(skipValue, value)) {
-                            continue;
-                        }
+                        continue;
                     }
                     if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key,
value, exchange)) {
                         values.add(value);

Modified: camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=1457824&r1=1457823&r2=1457824&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
(original)
+++ camel/branches/camel-2.10.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
Mon Mar 18 15:45:08 2013
@@ -122,10 +122,7 @@ public class HttpProducer extends Defaul
                     // we should not add headers for the parameters in the uri if we bridge
the endpoint
                     // as then we would duplicate headers on both the endpoint uri, and in
HTTP headers as well
                     if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key))
{
-                        Object skipValue = skipRequestHeaders.get(key);
-                        if (ObjectHelper.equal(skipValue, value)) {
-                            continue;
-                        }
+                        continue;
                     }
                     if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key,
value, exchange)) {
                         values.add(value);

Modified: camel/branches/camel-2.10.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1457824&r1=1457823&r2=1457824&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
(original)
+++ camel/branches/camel-2.10.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Mon Mar 18 15:45:08 2013
@@ -191,10 +191,7 @@ public class JettyHttpProducer extends D
                     // we should not add headers for the parameters in the uri if we bridge
the endpoint
                     // as then we would duplicate headers on both the endpoint uri, and in
HTTP headers as well
                     if (skipRequestHeaders != null && skipRequestHeaders.containsKey(key))
{
-                        Object skipValue = skipRequestHeaders.get(key);
-                        if (ObjectHelper.equal(skipValue, value)) {
-                            continue;
-                        }
+                        continue;
                     }
                     if (value != null && strategy != null && !strategy.applyFilterToCamelHeaders(key,
value, exchange)) {
                         values.add(value);



Mime
View raw message