#1240 client = null and call gc()

self-xdsd · Oct 14, 2021 · 8f27722 · 8f27722
1 parent 1dfaa98
commit 8f27722
Showing 1 changed file with 68 additions and 58 deletions.
diff --git a/self-core-impl/src/main/java/com/selfxdsd/core/JsonResources.java b/self-core-impl/src/main/java/com/selfxdsd/core/JsonResources.java
@@ -270,17 +270,17 @@ public Resource get(
             final Supplier<Map<String, List<String>>> headers
         ) {
             final ExecutorService exec = Executors.newSingleThreadExecutor();
+            HttpClient client = this.newHttpClient(exec);
             try {
-                final HttpResponse<String> response = this.newHttpClient(exec)
-                    .send(
-                        this.request(
-                            uri,
-                            "GET",
-                            headers.get(),
-                            HttpRequest.BodyPublishers.noBody()
-                        ),
-                        HttpResponse.BodyHandlers.ofString()
-                    );
+                final HttpResponse<String> response = client.send(
+                    this.request(
+                        uri,
+                        "GET",
+                        headers.get(),
+                        HttpRequest.BodyPublishers.noBody()
+                    ),
+                    HttpResponse.BodyHandlers.ofString()
+                );
                 return new JsonResponse(
                     response.statusCode(),
                     response.body(),
@@ -293,6 +293,8 @@ public Resource get(
                 );
             } finally {
                 exec.shutdownNow();
+                client = null;
+                System.gc();
             }
         }
 
@@ -303,19 +305,19 @@ public Resource post(
             final JsonValue body
         ) {
             final ExecutorService exec = Executors.newSingleThreadExecutor();
+            HttpClient client = this.newHttpClient(exec);
             try {
-                final HttpResponse<String> response = this.newHttpClient(exec)
-                    .send(
-                        this.request(
-                            uri,
-                            "POST",
-                            headers.get(),
-                            HttpRequest.BodyPublishers.ofString(
-                                body.toString()
-                            )
-                        ),
-                        HttpResponse.BodyHandlers.ofString()
-                    );
+                final HttpResponse<String> response = client.send(
+                    this.request(
+                        uri,
+                        "POST",
+                        headers.get(),
+                        HttpRequest.BodyPublishers.ofString(
+                            body.toString()
+                        )
+                    ),
+                    HttpResponse.BodyHandlers.ofString()
+                );
                 return new JsonResponse(
                     response.statusCode(),
                     response.body(),
@@ -329,6 +331,8 @@ public Resource post(
                 );
             } finally {
                 exec.shutdownNow();
+                client = null;
+                System.gc();
             }
         }
 
@@ -339,19 +343,19 @@ public Resource patch(
             final JsonValue body
         ) {
             final ExecutorService exec = Executors.newSingleThreadExecutor();
+            HttpClient client = this.newHttpClient(exec);
             try {
-                final HttpResponse<String> response = this.newHttpClient(exec)
-                    .send(
-                        this.request(
-                            uri,
-                            "PATCH",
-                            headers.get(),
-                            HttpRequest.BodyPublishers.ofString(
-                                body.toString()
-                            )
-                        ),
-                        HttpResponse.BodyHandlers.ofString()
-                    );
+                final HttpResponse<String> response = client.send(
+                    this.request(
+                        uri,
+                        "PATCH",
+                        headers.get(),
+                        HttpRequest.BodyPublishers.ofString(
+                            body.toString()
+                        )
+                    ),
+                    HttpResponse.BodyHandlers.ofString()
+                );
                 return new JsonResponse(
                     response.statusCode(),
                     response.body(),
@@ -365,6 +369,8 @@ public Resource patch(
                 );
             } finally {
                 exec.shutdownNow();
+                client = null;
+                System.gc();
             }
         }
 
@@ -375,19 +381,19 @@ public Resource put(
             final JsonValue body
         ) {
             final ExecutorService exec = Executors.newSingleThreadExecutor();
+            HttpClient client = this.newHttpClient(exec);
             try {
-                final HttpResponse<String> response = this.newHttpClient(exec)
-                    .send(
-                        this.request(
-                            uri,
-                            "PUT",
-                            headers.get(),
-                            HttpRequest.BodyPublishers.ofString(
-                                body.toString()
-                            )
-                        ),
-                        HttpResponse.BodyHandlers.ofString()
-                    );
+                final HttpResponse<String> response = client.send(
+                    this.request(
+                        uri,
+                        "PUT",
+                        headers.get(),
+                        HttpRequest.BodyPublishers.ofString(
+                            body.toString()
+                        )
+                    ),
+                    HttpResponse.BodyHandlers.ofString()
+                );
                 return new JsonResponse(
                     response.statusCode(),
                     response.body(),
@@ -401,6 +407,8 @@ public Resource put(
                 );
             } finally {
                 exec.shutdownNow();
+                client = null;
+                System.gc();
             }
         }
 
@@ -411,19 +419,19 @@ public Resource delete(
             final JsonValue body
         ) {
             final ExecutorService exec = Executors.newSingleThreadExecutor();
+            HttpClient client = this.newHttpClient(exec);
             try {
-                final HttpResponse<String> response = this.newHttpClient(exec)
-                    .send(
-                        this.request(
-                            uri,
-                            "DELETE",
-                            headers.get(),
-                            HttpRequest.BodyPublishers.ofString(
-                                body.toString()
-                            )
-                        ),
-                        HttpResponse.BodyHandlers.ofString()
-                    );
+                final HttpResponse<String> response = client.send(
+                    this.request(
+                        uri,
+                        "DELETE",
+                        headers.get(),
+                        HttpRequest.BodyPublishers.ofString(
+                            body.toString()
+                        )
+                    ),
+                    HttpResponse.BodyHandlers.ofString()
+                );
                 return new JsonResponse(
                     response.statusCode(),
                     response.body(),
@@ -437,6 +445,8 @@ public Resource delete(
                 );
             } finally {
                 exec.shutdownNow();
+                client = null;
+                System.gc();
             }
         }