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 2016/11/24 08:35:34 UTC
[2/4] camel git commit: Case mismatch - BreadcrumbId - Replaced with
the source from org.apache.camel.Exchange
Case mismatch - BreadcrumbId - Replaced with the source from
org.apache.camel.Exchange
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7efec745
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7efec745
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7efec745
Branch: refs/heads/master
Commit: 7efec7456a1534f8f05e87e9a520d9271246f8cd
Parents: 11e3bbf
Author: srinivasavasu <sr...@dhcp-0-130.blr.redhat.com>
Authored: Thu Nov 24 10:41:57 2016 +0530
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 24 09:33:31 2016 +0100
----------------------------------------------------------------------
.../spring/ws/filter/impl/BasicMessageFilter.java | 11 ++++++++---
.../spring/ws/filter/impl/BasicMessageFilterTest.java | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7efec745/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
index 800fbb0..aae2538 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
@@ -36,7 +36,6 @@ import org.springframework.ws.soap.SoapMessage;
* instance.
*/
public class BasicMessageFilter implements MessageFilter {
- private static final String BREADCRUMB_ID = "BreadcrumbId";
@Override
public void filterProducer(Exchange exchange, WebServiceMessage response) {
@@ -103,8 +102,14 @@ public class BasicMessageFilter implements MessageFilter {
headerKeySet.remove(SpringWebserviceConstants.SPRING_WS_ADDRESSING_PRODUCER_REPLY_TO);
headerKeySet.remove(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_FAULT_ACTION);
headerKeySet.remove(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_OUTPUT_ACTION);
-
- headerKeySet.remove(BREADCRUMB_ID);
+ // This gets repeated again in the below 'for loop' and gets added as attribute to soapenv:header.
+ // This would have already been processed in SpringWebserviceProducer/Consumer instance.
+ headerKeySet.remove(SpringWebserviceConstants.SPRING_WS_SOAP_HEADER);
+
+ // Replaced local constant 'BreadcrumbId' with the actual constant key in header 'breadcrumbId'
+ // from org.apache.camel.Exchange.BREADCRUMB_ID. Because of this case mismatch, this key never
+ // gets removed from header rather gets added to soapHeader all the time.
+ headerKeySet.remove(Exchange.BREADCRUMB_ID);
for (String name : headerKeySet) {
Object value = headers.get(name);
http://git-wip-us.apache.org/repos/asf/camel/blob/7efec745/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
index 22e88f5..072a601 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
@@ -92,7 +92,7 @@ public class BasicMessageFilterTest extends ExchangeTestSupport {
exchange.getOut().getHeaders().put(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_OUTPUT_ACTION, "mustBeRemoved");
exchange.getOut().getHeaders().put(SpringWebserviceConstants.SPRING_WS_ENDPOINT_URI, "mustBeRemoved");
- exchange.getOut().getHeaders().put("BreadcrumbId", "mustBeRemoved");
+ exchange.getOut().getHeaders().put("breadcrumbId", "mustBeRemoved");
filter.filterConsumer(exchange, message);