root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed generateETagHeaderValue's IOException handling 

Issue: SPR-12081
This commit is contained in:
Juergen Hoeller 2015-09-02 19:43:15 +02:00
parent 93f3b9cbe0
commit eeab7f38a2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
View File

@ -163,14 +163,9 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
* @return the ETag header value * @return the ETag header value
* @see org.springframework.util.DigestUtils * @see org.springframework.util.DigestUtils
*/ */
protected String generateETagHeaderValue(InputStream inputStream) { protected String generateETagHeaderValue(InputStream inputStream) throws IOException {
StringBuilder builder = new StringBuilder("\"0"); StringBuilder builder = new StringBuilder("\"0");
try { DigestUtils.appendMd5DigestAsHex(inputStream, builder);
DigestUtils.appendMd5DigestAsHex(inputStream, builder);
}
catch (IOException e) {
throw new RuntimeException(e);
}
builder.append('"'); builder.append('"');
return builder.toString(); return builder.toString();
} }
@ -184,7 +179,7 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
* @since 4.2 * @since 4.2
*/ */
public static void disableContentCaching(ServletRequest request) { public static void disableContentCaching(ServletRequest request) {
Assert.notNull(request); Assert.notNull(request, "ServletRequest must not be null");
request.setAttribute(STREAMING_ATTRIBUTE, true); request.setAttribute(STREAMING_ATTRIBUTE, true);
} }