SPR-7160 - ShallowEtagHeaderFilter not adding ETag

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3306 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java

@@ -113,8 +113,9 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
 	}
 
 	/**
-	 * Generate the ETag header value from the given response body byte array. <p>The default implementation generates an
-	 * MD5 hash.
+	 * Generate the ETag header value from the given response body byte array.
+	 *
+	 * <p>The default implementation generates an MD5 hash.
 	 *
 	 * @param bytes the response bdoy as byte array
 	 * @return the ETag header value
@@ -140,7 +141,7 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
 
 		private PrintWriter writer;
 
-		private int statusCode = -1;
+		private int statusCode = HttpServletResponse.SC_OK;
 
 		private ShallowEtagResponseWrapper(HttpServletResponse response) {
 			super(response);

org.springframework.web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java

@@ -31,7 +31,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.util.FileCopyUtils;
 
-public class ShallowEtagHeaderFilterTest {
+public class ShallowEtagHeaderFilterTests {
 
 	private ShallowEtagHeaderFilter filter;
 
@@ -85,7 +85,6 @@ public class ShallowEtagHeaderFilterTest {
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid request passed", request, filterRequest);
-				((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK);
 				byte[] responseBody = "Hello World".getBytes("UTF-8");
 				FileCopyUtils.copy(responseBody, filterResponse.getOutputStream());
 			}