Merge branch '5.3.x'

# Conflicts:
#	spring-context/spring-context.gradle
#	spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
This commit is contained in:
Juergen Hoeller
2021-09-21 17:47:27 +02:00
7 changed files with 35 additions and 22 deletions

View File

@@ -324,7 +324,9 @@ public class ClassReader {
}
outputStream.flush();
if (readCount == 1) {
return data;
// SPRING PATCH: some misbehaving InputStreams return -1 but still write to buffer (gh-27429)
// return data;
// END OF PATCH
}
return outputStream.toByteArray();
} finally {

View File

@@ -275,6 +275,7 @@ public class ReactiveAdapterRegistry {
}
}
private static class RxJava3Registrar {
void registerAdapters(ReactiveAdapterRegistry registry) {