From 43d72e2079d94edd6a8bcd26e59ed7ef2c4ca996 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 12 Nov 2015 00:47:33 +0100 Subject: [PATCH] Restored capacity check before trying output stream resize Issue: SPR-13671 --- .../web/util/ContentCachingResponseWrapper.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java index eee6d8eb6a..ee0643f82d 100644 --- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java @@ -123,7 +123,9 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper { @Override public void setContentLength(int len) { - this.content.resize(len); + if (len > this.content.size()) { + this.content.resize(len); + } this.contentLength = len; } @@ -134,13 +136,17 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper { Integer.MAX_VALUE + "): " + len); } int lenInt = (int) len; - this.content.resize(lenInt); + if (lenInt > this.content.size()) { + this.content.resize(lenInt); + } this.contentLength = lenInt; } @Override public void setBufferSize(int size) { - this.content.resize(size); + if (size > this.content.size()) { + this.content.resize(size); + } } @Override