Merge branch '4.1.x'

Closes gh-1668

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -413,7 +413,7 @@ private void initFaultMessageResolver(DefaultStrategiesHelper helper) throws Bea
 	}
 
 	@Override
-	public @Nullable Object marshalSendAndReceive(final Object requestPayload,
+	public @Nullable Object marshalSendAndReceive(final @Nullable Object requestPayload,
 			final @Nullable WebServiceMessageCallback requestCallback) {
 		String defaultUri = getDefaultUri();
 		Assert.notNull(defaultUri, "'defaultUri' must not be null");
@@ -433,9 +433,9 @@ public void doWithMessage(WebServiceMessage request) throws IOException, Transfo
 								"No marshaller registered. Check configuration of WebServiceTemplate.");
 					}
 					MarshallingUtils.marshal(marshaller, requestPayload, request);
-					if (requestCallback != null) {
-						requestCallback.doWithMessage(request);
-					}
+				}
+				if (requestCallback != null) {
+					requestCallback.doWithMessage(request);
 				}
 			}
 		}, new WebServiceMessageExtractor<>() {

spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java

@@ -56,6 +56,7 @@
 import static org.mockito.Mockito.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("unchecked")
@@ -271,25 +272,43 @@ void testSendAndReceiveResultNoResponsePayload() throws Exception {
 
 	@Test
 	void testSendAndReceiveMarshalResponse() throws Exception {
+		Object unmarshalled = new Object();
+		setupMarshallerAndUnmarshaller(unmarshalled);
+		Object result = this.template.marshalSendAndReceive(new Object());
+		assertThat(result).isEqualTo(unmarshalled);
+	}
 
+	@Test
+	void testSendAndReceiveInvokesCallback() throws Exception {
+		WebServiceMessageCallback callback = mock(WebServiceMessageCallback.class);
+		setupMarshallerAndUnmarshaller(new Object());
+		this.template.marshalSendAndReceive(new Object(), callback);
+		verify(callback).doWithMessage(isA(MockWebServiceMessage.class));
+	}
+
+	@Test
+	void testSendAndReceiveWithNoBodyInvokesCallback() throws Exception {
+		WebServiceMessageCallback callback = mock(WebServiceMessageCallback.class);
+		setupMarshallerAndUnmarshaller(new Object());
+		Object requestPayload = null;
+		this.template.marshalSendAndReceive(requestPayload, callback);
+		verify(callback).doWithMessage(isA(MockWebServiceMessage.class));
+	}
+
+	private void setupMarshallerAndUnmarshaller(Object unmarshalled) throws Exception {
 		Marshaller marshallerMock = mock(Marshaller.class);
 		this.template.setMarshaller(marshallerMock);
 		marshallerMock.marshal(isA(Object.class), isA(Result.class));
 
 		Unmarshaller unmarshallerMock = mock(Unmarshaller.class);
 		this.template.setUnmarshaller(unmarshallerMock);
-		Object unmarshalled = new Object();
 		when(unmarshallerMock.unmarshal(isA(Source.class))).thenReturn(unmarshalled);
 
 		this.connectionMock.send(isA(WebServiceMessage.class));
 		when(this.connectionMock.hasError()).thenReturn(false);
 		when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("<response/>"));
 		when(this.connectionMock.hasFault()).thenReturn(false);
 		this.connectionMock.close();
-
-		Object result = this.template.marshalSendAndReceive(new Object());
-
-		assertThat(result).isEqualTo(unmarshalled);
 	}
 
 	@Test