root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Nullability fixes for AtomicReference variables 

Closes gh-35514
Signed-off-by: Manu Sridharan <msridhar@gmail.com>
This commit is contained in:
Manu Sridharan 2025-09-19 16:31:54 -07:00 committed by Sébastien Deleuze
parent 051adf267f
commit e834a3a80c
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java
View File

@ -137,7 +137,7 @@ final class OutputStreamPublisher<T> implements Publisher<T> {
private final AtomicLong requested = new AtomicLong(); private final AtomicLong requested = new AtomicLong();
private final AtomicReference<Object> parkedThread = new AtomicReference<>(); private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
private volatile @Nullable Throwable error; private volatile @Nullable Throwable error;

2
spring-core/src/main/java/org/springframework/core/io/buffer/SubscriberInputStream.java
View File

@ -72,7 +72,7 @@ final class SubscriberInputStream extends InputStream implements Subscriber<Data
private final Queue<DataBuffer> queue; private final Queue<DataBuffer> queue;
private final AtomicReference<Object> parkedThread = new AtomicReference<>(); private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
private final AtomicInteger workAmount = new AtomicInteger(); private final AtomicInteger workAmount = new AtomicInteger();

2
spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/SingleConnectionFactory.java
View File

@ -73,7 +73,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory
private @Nullable Boolean autoCommit; private @Nullable Boolean autoCommit;
/** Wrapped Connection. */ /** Wrapped Connection. */
private final AtomicReference<Connection> target = new AtomicReference<>(); private final AtomicReference<@Nullable Connection> target = new AtomicReference<>();
/** Proxy Connection. */ /** Proxy Connection. */
private @Nullable Connection connection; private @Nullable Connection connection;

2
spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
View File

@ -54,7 +54,7 @@ class DefaultMvcResult implements MvcResult {
private @Nullable Exception resolvedException; private @Nullable Exception resolvedException;
private final AtomicReference<Object> asyncResult = new AtomicReference<>(RESULT_NONE); private final AtomicReference<@Nullable Object> asyncResult = new AtomicReference<>(RESULT_NONE);
private @Nullable CountDownLatch asyncDispatchLatch; private @Nullable CountDownLatch asyncDispatchLatch;

2
spring-web/src/main/java/org/springframework/http/client/OutputStreamPublisher.java
View File

@ -135,7 +135,7 @@ final class OutputStreamPublisher<T> implements Flow.Publisher<T> {
private final AtomicLong requested = new AtomicLong(); private final AtomicLong requested = new AtomicLong();
private final AtomicReference<Object> parkedThread = new AtomicReference<>(); private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
private volatile @Nullable Throwable error; private volatile @Nullable Throwable error;

5
spring-web/src/main/java/org/springframework/http/client/ReactorClientHttpRequest.java
View File

@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.net.URI; import java.net.URI;
import java.time.Duration; import java.time.Duration;
import java.util.Objects;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -131,13 +132,13 @@ final class ReactorClientHttpRequest extends AbstractStreamingClientHttpRequest
return Mono.empty(); return Mono.empty();
} }
AtomicReference<Executor> executorRef = new AtomicReference<>(); AtomicReference<@Nullable Executor> executorRef = new AtomicReference<>();
return outbound return outbound
.withConnection(connection -> executorRef.set(connection.channel().eventLoop())) .withConnection(connection -> executorRef.set(connection.channel().eventLoop()))
.send(FlowAdapters.toPublisher(new OutputStreamPublisher<>( .send(FlowAdapters.toPublisher(new OutputStreamPublisher<>(
os -> body.writeTo(StreamUtils.nonClosing(os)), new ByteBufMapper(outbound), os -> body.writeTo(StreamUtils.nonClosing(os)), new ByteBufMapper(outbound),
executorRef.getAndSet(null), null))); Objects.requireNonNull(executorRef.getAndSet(null)), null)));
} }
static IOException convertException(RuntimeException ex) { static IOException convertException(RuntimeException ex) {

2
spring-web/src/main/java/org/springframework/http/client/SubscriberInputStream.java
View File

@ -81,7 +81,7 @@ final class SubscriberInputStream<T> extends InputStream implements Flow.Subscri
private final Queue<T> queue; private final Queue<T> queue;
private final AtomicReference<Object> parkedThread = new AtomicReference<>(); private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
private final AtomicInteger workAmount = new AtomicInteger(); private final AtomicInteger workAmount = new AtomicInteger();

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
View File

@ -256,7 +256,7 @@ class ReactiveTypeHandler {
private @Nullable Subscription subscription; private @Nullable Subscription subscription;
private final AtomicReference<Object> elementRef = new AtomicReference<>(); private final AtomicReference<@Nullable Object> elementRef = new AtomicReference<>();
private @Nullable Throwable error; private @Nullable Throwable error;