Skip to content

Fix broken double-checked locking in the R2DBC connection factory #11913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivankrn wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −7
Open

Fix broken double-checked locking in the R2DBC connection factory #11913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...es/r2dbc/src/main/java/org/testcontainers/r2dbc/TestcontainersR2DBCConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TestcontainersR2DBCConnectionFactory implements ConnectionFactory, Closeab

private final R2DBCDatabaseContainerProvider containerProvider;

private CompletableFuture<R2DBCDatabaseContainer> future;
private volatile CompletableFuture<R2DBCDatabaseContainer> future;

TestcontainersR2DBCConnectionFactory(ConnectionFactoryOptions options) {
this.options = options;
Expand All @@ -47,10 +47,12 @@ class TestcontainersR2DBCConnectionFactory implements ConnectionFactory, Closeab
@Override
public Publisher<? extends Connection> create() {
return new ConnectionPublisher(() -> {
if (future == null) {
CompletableFuture<R2DBCDatabaseContainer> futureRef = future;
if (futureRef == null) {
synchronized (this) {
if (future == null) {
future =
futureRef = future;
if (futureRef == null) {
futureRef =
CompletableFuture.supplyAsync(
() -> {
R2DBCDatabaseContainer container = containerProvider.createContainer(options);
Expand All @@ -59,12 +61,11 @@ public Publisher<? extends Connection> create() {
},
EXECUTOR
);
future = futureRef;
}
}
}
return future.thenApply(it -> {
return ConnectionFactories.find(it.configure(options));
});
return futureRef.thenApply(it -> ConnectionFactories.find(it.configure(options)));
});
}

Expand Down