Changeset 35356 in osm for applications/editors/josm/plugins

Timestamp:

2020-03-10T16:43:52+01:00 (5 years ago)

Author:

simon04

Message:

fix #josm18905 - Too many open files when panning

File:

• applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2/Http2Client.java (modified) (6 diffs)

applications/editors/josm/plugins/http2/src/org/openstreetmap/josm/plugins/http2/Http2Client.java

@@ -22 +22 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.openstreetmap.josm.data.Version;
@@ -34 +35 @@
 public final class Http2Client extends org.openstreetmap.josm.tools.HttpClient {
 
-    private HttpClient.Builder clientBuilder;
-    private HttpRequest.Builder requestBuilder;
+    private static final Map<Duration, HttpClient> clientForConnectTimeout = new ConcurrentHashMap<>();
+    private HttpRequest request;
     private HttpResponse<InputStream> response;
 
@@ -44 +45 @@
     @Override
     protected void setupConnection(ProgressMonitor progressMonitor) throws IOException {
-        clientBuilder = HttpClient.newBuilder().followRedirects(Redirect.NEVER); // we do that ourselves
-        int timeout = getConnectTimeout();
-        if (timeout > 0) {
-            clientBuilder.connectTimeout(Duration.ofMillis(timeout));
-        }
+        HttpRequest.Builder requestBuilder;
         try {
             requestBuilder = HttpRequest.newBuilder()
@@ -59 +56 @@
             throw new IOException(e);
         }
-        timeout = getReadTimeout();
+        int timeout = getReadTimeout();
         if (timeout > 0) {
             requestBuilder.timeout(Duration.ofMillis(timeout));
@@ -79 +76 @@
             }
         }
+        request = requestBuilder.build();
 
         notifyConnect(progressMonitor);
@@ -89 +87 @@
     @Override
     protected ConnectionResponse performConnection() throws IOException {
+        // reuse HttpClient
+        HttpClient client = clientForConnectTimeout.computeIfAbsent(Duration.ofMillis(getConnectTimeout()), timeout ->
+                HttpClient.newBuilder()
+                        .followRedirects(Redirect.NEVER) // we do that ourselves
+                        .connectTimeout(timeout)
+                        .build());
         try {
-            response = clientBuilder.build().send(requestBuilder.build(), BodyHandlers.ofInputStream());
+            response = client.send(request, BodyHandlers.ofInputStream());
             return new ConnectionResponse() {
                 @Override