Skip to content

Commit e834a3a

Browse files
msridharsdeleuze
authored andcommitted
Nullability fixes for AtomicReference variables
Closes gh-35514 Signed-off-by: Manu Sridharan <[email protected]>
1 parent 051adf2 commit e834a3a

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private static final class OutputStreamSubscription<T> extends OutputStream impl
137137

138138
private final AtomicLong requested = new AtomicLong();
139139

140-
private final AtomicReference<Object> parkedThread = new AtomicReference<>();
140+
private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
141141

142142
private volatile @Nullable Throwable error;
143143

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ final class SubscriberInputStream extends InputStream implements Subscriber<Data
7272

7373
private final Queue<DataBuffer> queue;
7474

75-
private final AtomicReference<Object> parkedThread = new AtomicReference<>();
75+
private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
7676

7777
private final AtomicInteger workAmount = new AtomicInteger();
7878

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory
7373
private @Nullable Boolean autoCommit;
7474

7575
/** Wrapped Connection. */
76-
private final AtomicReference<Connection> target = new AtomicReference<>();
76+
private final AtomicReference<@Nullable Connection> target = new AtomicReference<>();
7777

7878
/** Proxy Connection. */
7979
private @Nullable Connection connection;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class DefaultMvcResult implements MvcResult {
5454

5555
private @Nullable Exception resolvedException;
5656

57-
private final AtomicReference<Object> asyncResult = new AtomicReference<>(RESULT_NONE);
57+
private final AtomicReference<@Nullable Object> asyncResult = new AtomicReference<>(RESULT_NONE);
5858

5959
private @Nullable CountDownLatch asyncDispatchLatch;
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private static final class OutputStreamSubscription<T> extends OutputStream impl
135135

136136
private final AtomicLong requested = new AtomicLong();
137137

138-
private final AtomicReference<Object> parkedThread = new AtomicReference<>();
138+
private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
139139

140140
private volatile @Nullable Throwable error;
141141

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.UncheckedIOException;
2121
import java.net.URI;
2222
import java.time.Duration;
23+
import java.util.Objects;
2324
import java.util.concurrent.Executor;
2425
import java.util.concurrent.atomic.AtomicReference;
2526

@@ -131,13 +132,13 @@ private Publisher<Void> send(
131132
return Mono.empty();
132133
}
133134

134-
AtomicReference<Executor> executorRef = new AtomicReference<>();
135+
AtomicReference<@Nullable Executor> executorRef = new AtomicReference<>();
135136

136137
return outbound
137138
.withConnection(connection -> executorRef.set(connection.channel().eventLoop()))
138139
.send(FlowAdapters.toPublisher(new OutputStreamPublisher<>(
139140
os -> body.writeTo(StreamUtils.nonClosing(os)), new ByteBufMapper(outbound),
140-
executorRef.getAndSet(null), null)));
141+
Objects.requireNonNull(executorRef.getAndSet(null)), null)));
141142
}
142143

143144
static IOException convertException(RuntimeException ex) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ final class SubscriberInputStream<T> extends InputStream implements Flow.Subscri
8181

8282
private final Queue<T> queue;
8383

84-
private final AtomicReference<Object> parkedThread = new AtomicReference<>();
84+
private final AtomicReference<@Nullable Object> parkedThread = new AtomicReference<>();
8585

8686
private final AtomicInteger workAmount = new AtomicInteger();
8787

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private abstract static class AbstractEmitterSubscriber implements Subscriber<Ob
256256

257257
private @Nullable Subscription subscription;
258258

259-
private final AtomicReference<Object> elementRef = new AtomicReference<>();
259+
private final AtomicReference<@Nullable Object> elementRef = new AtomicReference<>();
260260

261261
private @Nullable Throwable error;
262262

0 commit comments

Comments
 (0)