Merge branch '6.2.x'

bclozel · bclozel · commit cd80ca0fe026 · 2025-06-13T09:57:18.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferInputStream.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferInputStream.java
@@ -124,7 +124,7 @@ public long skip(long n) throws IOException {
 			return 0L;
 		}
 		int skipped = Math.min(available(), n > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) n);
-		this.dataBuffer.readPosition(Math.min(this.end, this.dataBuffer.readPosition() + skipped));
+		this.dataBuffer.readPosition(this.dataBuffer.readPosition() + skipped);
 		return skipped;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public long skip(long n) throws IOException {`
`124`	`124`	`return 0L;`
`125`	`125`	`}`
`126`	`126`	`int skipped = Math.min(available(), n > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) n);`
`127`		`- this.dataBuffer.readPosition(Math.min(this.end, this.dataBuffer.readPosition() + skipped));`
	`127`	`+ this.dataBuffer.readPosition(this.dataBuffer.readPosition() + skipped);`
`128`	`128`	`return skipped;`
`129`	`129`	`}`
`130`	`130`