From 3b4ae7b028799e6b9f33e44ead1d9038d0d55b47 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 12 Apr 2022 16:52:13 +0200
Subject: [PATCH] TomcatHttpHandlerAdapter continues after 0 bytes

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
---
 .../http/server/reactive/TomcatHttpHandlerAdapter.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 7920c7ffd8b4..b8c78fdbf4e4 100644
--- 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 {