Merge pull request #31731 from kilink

snicoll · snicoll · commit 0dbb0f5c147e · 2023-12-01T10:58:44.000+01:00
* pr/31731: Avoid byte array copy in getContentAsString Closes gh-31731
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -205,7 +205,7 @@ public byte[] getContentAsByteArray() {
 	 * @see #getContentAsByteArray()
 	 */
 	public String getContentAsString() {
-		return new String(this.cachedContent.toByteArray(), Charset.forName(getCharacterEncoding()));
+		return new String(this.cachedContent.toByteArrayUnsafe(), Charset.forName(getCharacterEncoding()));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public byte[] getContentAsByteArray() {`
`205`	`205`	`* @see #getContentAsByteArray()`
`206`	`206`	`*/`
`207`	`207`	`public String getContentAsString() {`
`208`		`- return new String(this.cachedContent.toByteArray(), Charset.forName(getCharacterEncoding()));`
	`208`	`+ return new String(this.cachedContent.toByteArrayUnsafe(), Charset.forName(getCharacterEncoding()));`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/**`