From b78e222672b64942f2282a25aa6f7ecdf172d344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=A9?= Date: Thu, 29 Jul 2021 18:51:47 +0800 Subject: [PATCH] simplily build singleton dapr http --- .../main/java/io/dapr/client/DaprHttpBuilder.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java b/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java index 26ed5e999a..7c0d3c6c58 100644 --- a/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java +++ b/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java @@ -9,7 +9,6 @@ import okhttp3.OkHttpClient; import java.time.Duration; -import java.util.concurrent.atomic.AtomicReference; /** * A builder for the DaprHttp. @@ -19,7 +18,7 @@ public class DaprHttpBuilder { /** * Singleton OkHttpClient. */ - private static final AtomicReference OK_HTTP_CLIENT = new AtomicReference<>(); + private static volatile OkHttpClient OK_HTTP_CLIENT; /** * Static lock object. @@ -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); } }