From eeab7f38a26976acbe693c5991ff25588cf57dab Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 2 Sep 2015 19:43:15 +0200 Subject: [PATCH] Fixed generateETagHeaderValue's IOException handling Issue: SPR-12081 --- .../web/filter/ShallowEtagHeaderFilter.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java index 805697a3b07..211cb0ebb33 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java @@ -163,14 +163,9 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter { * @return the ETag header value * @see org.springframework.util.DigestUtils */ - protected String generateETagHeaderValue(InputStream inputStream) { + protected String generateETagHeaderValue(InputStream inputStream) throws IOException { StringBuilder builder = new StringBuilder("\"0"); - try { - DigestUtils.appendMd5DigestAsHex(inputStream, builder); - } - catch (IOException e) { - throw new RuntimeException(e); - } + DigestUtils.appendMd5DigestAsHex(inputStream, builder); builder.append('"'); return builder.toString(); } @@ -184,7 +179,7 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter { * @since 4.2 */ public static void disableContentCaching(ServletRequest request) { - Assert.notNull(request); + Assert.notNull(request, "ServletRequest must not be null"); request.setAttribute(STREAMING_ATTRIBUTE, true); }