Merge pull request #1580 from epabst/SPR-16132

Move requests.add(request) into finally block.

Author: jhoeller

spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java

@@ -80,9 +80,12 @@ public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOEx
 			if (requests.isEmpty()) {
 				afterExpectationsDeclared();
 			}
-			ClientHttpResponse response = validateRequestInternal(request);
-			requests.add(request);
-			return response;
+			try {
+				return validateRequestInternal(request);
+			}
+			finally {
+				requests.add(request);
+			}
 		}
 	}
 

spring-test/src/test/java/org/springframework/test/web/client/SimpleRequestExpectationManagerTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.client;
 
+import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -30,6 +31,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
+import static org.springframework.test.util.AssertionErrors.fail;
 import static org.springframework.test.web.client.ExpectedCount.max;
 import static org.springframework.test.web.client.ExpectedCount.min;
 import static org.springframework.test.web.client.ExpectedCount.once;
@@ -184,6 +186,23 @@ public void repeatedRequestsInSequentialOrder() throws Exception {
 		this.manager.validateRequest(createRequest(GET, "/bar"));
 	}
 
+	@Test  // SPR-16132
+	public void sequentialRequestsWithFirstFailing() throws Exception {
+		this.manager.expectRequest(once(), requestTo("/foo")).andExpect(method(GET))
+				.andRespond(request -> { throw new SocketException("pseudo network error"); });
+		this.manager.expectRequest(once(), requestTo("/handle-error")).andExpect(method(POST)).andRespond(withSuccess());
+
+		try {
+			this.manager.validateRequest(createRequest(GET, "/foo"));
+			fail("expected exception");
+		}
+		catch (SocketException e) {
+			//expected
+		}
+		this.manager.validateRequest(createRequest(POST, "/handle-error"));
+		this.manager.verify();
+	}
+
 
 	private ClientHttpRequest createRequest(HttpMethod method, String url) {
 		try {