MockHttpServletResponse writer sets committed flag

Issue: SPR-16683

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -742,6 +742,13 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super.flush();
 			setCommitted(true);
 		}
+
+		@Override
+		public void close() {
+			super.flush();
+			super.close();
+			setCommitted(true);
+		}
 	}
 
 }

spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java

@@ -227,6 +227,16 @@ public class MockHttpServletResponseTests {
 		assertEquals(1, response.getContentAsByteArray().length);
 	}
 
+	@Test // SPR-16683
+	public void servletWriterCommittedOnWriterClose() throws IOException {
+		assertFalse(response.isCommitted());
+		response.getWriter().write("X");
+		assertFalse(response.isCommitted());
+		response.getWriter().close();
+		assertTrue(response.isCommitted());
+		assertEquals(1, response.getContentAsByteArray().length);
+	}
+
 	@Test
 	public void servletWriterAutoFlushedForString() throws IOException {
 		response.getWriter().write("X");