TomcatHttpHandlerAdapter continues after 0 bytes

poutsma · poutsma · commit 3b4ae7b02879 · 2022-04-12T16:52:13.000+02:00
This commit makes sure that TomcatServerHttpRequest::readFromInputStream follows the same contract as the method it overrides, and returns AbstractListenerReadPublisher.EMPTY_BUFFER when 0 bytes are read. See gh-28241
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
@@ -153,7 +153,7 @@ else if (read == -1) {
 					return EOF_BUFFER;
 				}
 				else {
-					return null;
+					return AbstractListenerReadPublisher.EMPTY_BUFFER;
 				}
 			}
 			finally {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ else if (read == -1) {`
`153`	`153`	`return EOF_BUFFER;`
`154`	`154`	`}`
`155`	`155`	`else {`
`156`		`- return null;`
	`156`	`+ return AbstractListenerReadPublisher.EMPTY_BUFFER;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`finally {`