From 374111e043a773a3f7f9170c2c74244bccba2da1 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Tue, 5 Jun 2007 00:48:36 +0000 Subject: [PATCH] Fixed SWS-135: Implement client-side TransportContext --- .../springframework/ws/client/core/WebServiceTemplate.java | 6 ++++++ src/changes/changes.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index 206014d0..9af253b4 100644 --- a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -48,6 +48,9 @@ import org.springframework.ws.transport.FaultAwareWebServiceConnection; import org.springframework.ws.transport.TransportException; import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.WebServiceMessageSender; +import org.springframework.ws.transport.context.DefaultTransportContext; +import org.springframework.ws.transport.context.TransportContext; +import org.springframework.ws.transport.context.TransportContextHolder; import org.springframework.ws.transport.support.DefaultStrategiesHelper; /** @@ -348,9 +351,11 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService WebServiceMessageExtractor responseExtractor) { Assert.notNull(responseExtractor, "'responseExtractor' must not be null"); Assert.hasLength(uri, "'uri' must not be empty"); + TransportContext previousTransportContext = TransportContextHolder.getTransportContext(); WebServiceConnection connection = null; try { connection = createConnection(uri); + TransportContextHolder.setTransportContext(new DefaultTransportContext(connection)); WebServiceMessage request = getMessageFactory().createWebServiceMessage(); if (requestCallback != null) { requestCallback.doInMessage(request); @@ -384,6 +389,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService logger.debug("Could not close WebServiceConnection", ex); } } + TransportContextHolder.setTransportContext(previousTransportContext); } } diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 79732d97..8fe7e89c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -6,6 +6,7 @@ + Implement client-side TransportContext Added ignoreExtraAttributes and ignoreExtraElements properties to CastorMarshaller