Skip to content

Use volatile for build singleton dapr http client #590

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

Merged
artursouza merged 6 commits into from
Aug 20, 2021
Merged

Use volatile for build singleton dapr http client #590

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b78e222
simplily build singleton dapr http
blackstorm Jul 29, 2021
794aada
Merge branch 'master' into simplify-build-dapr-http
blackstorm Jul 30, 2021
df44ac6
Merge branch 'master' into simplify-build-dapr-http
blackstorm Aug 13, 2021
996107b
Merge branch 'master' into simplify-build-dapr-http
artursouza Aug 14, 2021
26fbe86
Merge branch 'master' into simplify-build-dapr-http
artursouza Aug 18, 2021
4eba777
Merge branch 'master' into simplify-build-dapr-http
artursouza Aug 20, 2021
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
12 changes: 5 additions & 7 deletions sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import okhttp3.OkHttpClient;

import java.time.Duration;
import java.util.concurrent.atomic.AtomicReference;

/**
* A builder for the DaprHttp.
Expand All @@ -19,7 +18,7 @@ public class DaprHttpBuilder {
/**
* Singleton OkHttpClient.
*/
private static final AtomicReference<OkHttpClient> OK_HTTP_CLIENT = new AtomicReference<>();
private static volatile OkHttpClient OK_HTTP_CLIENT;

/**
* Static lock object.
Expand All @@ -42,18 +41,17 @@ public DaprHttp build() {
* @return Instance of {@link DaprHttp}
*/
private DaprHttp buildDaprHttp() {
if (OK_HTTP_CLIENT.get() == null) {
if (OK_HTTP_CLIENT == null) {
synchronized (LOCK) {
if (OK_HTTP_CLIENT.get() == null) {
if (OK_HTTP_CLIENT == null) {
OkHttpClient.Builder builder = new OkHttpClient.Builder();
Duration readTimeout = Duration.ofSeconds(Properties.HTTP_CLIENT_READ_TIMEOUT_SECONDS.get());
builder.readTimeout(readTimeout);
OkHttpClient okHttpClient = builder.build();
OK_HTTP_CLIENT.set(okHttpClient);
OK_HTTP_CLIENT = builder.build();
}
}
}

return new DaprHttp(Properties.SIDECAR_IP.get(), Properties.HTTP_PORT.get(), OK_HTTP_CLIENT.get());
return new DaprHttp(Properties.SIDECAR_IP.get(), Properties.HTTP_PORT.get(), OK_HTTP_CLIENT);
}
}