From a0a3fe41f660f2e21a3251d90448be73a6bfeac1 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 26 May 2026 16:39:30 +0200 Subject: [PATCH] Polish contribution See gh-36833 (cherry picked from commit 6e122d3aaa5b3ee4c72d28a434efcec1b6515612) --- .../springframework/core/serializer/DefaultDeserializer.java | 4 ++-- .../org/springframework/core/serializer/SerializerTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java index 264caeed092..2eee7d0e671 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java @@ -61,8 +61,8 @@ public class DefaultDeserializer implements Deserializer { /** * Return the {@link ClassLoader} to use for deserialization, or {@code null} - * to use the "latest user-defined ClassLoader" of {@link ObjectInputStream}. - * @since 7.1 + * to use the "latest user-defined ClassLoader". + * @since 6.2.19 * @see ConfigurableObjectInputStream#ConfigurableObjectInputStream(InputStream, ClassLoader) */ @Nullable diff --git a/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java b/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java index d72ef32f8e9..05b822f3b0f 100644 --- a/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java +++ b/spring-core/src/test/java/org/springframework/core/serializer/SerializerTests.java @@ -78,12 +78,12 @@ class SerializerTests { assertThat(deserializer.expectedInputStream).isNotNull(); } - @Test + @Test // gh-36833 void defaultDeserializerExposesNullClassLoaderByDefault() { assertThat(new DefaultDeserializer().getClassLoader()).isNull(); } - @Test + @Test // gh-36833 void defaultDeserializerExposesConfiguredClassLoader() { ClassLoader classLoader = getClass().getClassLoader(); assertThat(new DefaultDeserializer(classLoader).getClassLoader()).isSameAs(classLoader);