Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize ContentCachingRequestWrapper allocation

Browse Source 
This commit builds on top of changes made in gh-29775 and gh-31737.
Before this change, we would allocate several byte arrays even in cases
of known request size. This could decrease performance when getting the
cached content as it requires merging several arrays and data is not
colocated in memory.

This change ensures that we create a `FastByteArrayOutputStream`
instance with the known request size so that the first allocated segment
can contain the entire content.
If the request size is not know, we will default back on the default
allocation size for the `FastByteArrayOutputStream`.

Closes gh-31834
This commit is contained in:
Brian Clozel
2023-12-13 16:40:53 +01:00
parent a01c6d57bb
commit 0970b1dc7a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
View File

@@ -56,7 +56,7 @@ import org.springframework.util.FastByteArrayOutputStream;
*/
public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
private final FastByteArrayOutputStream cachedContent = new FastByteArrayOutputStream();
private FastByteArrayOutputStream cachedContent;
@Nullable
private final Integer contentCacheLimit;
@@ -74,6 +74,8 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
*/
public ContentCachingRequestWrapper(HttpServletRequest request) {
super(request);
int contentLength = request.getContentLength();
this.cachedContent = (contentLength > 0) ? new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream();
this.contentCacheLimit = null;
}
@@ -86,6 +88,8 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
*/
public ContentCachingRequestWrapper(HttpServletRequest request, int contentCacheLimit) {
super(request);
int contentLength = request.getContentLength();
this.cachedContent = (contentLength > 0) ? new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream();
this.contentCacheLimit = contentCacheLimit;
}