Changeset 18332 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2021-12-20T14:12:10+01:00 (3 years ago)

Author:

Don-vip

Message:

see #21596 - Update dependencies in ivy.xml and tools/ivy.xml (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -379 +379 @@
          * @see HttpURLConnection#getErrorStream()
          */
-        @SuppressWarnings("resource")
+        @SuppressWarnings({"resource",
+                /* All 4 `InputStream in` reassignments would close the original when the returned stream is closed */
+                "PMD.CloseResource"})
         public final InputStream getContent() throws IOException {
-            InputStream in = getInputStream();
-            in = new ProgressInputStream(in, getContentLength(), monitor);
-            in = "gzip".equalsIgnoreCase(getContentEncoding())
-                    ? new GZIPInputStream(in)
-                    : "deflate".equalsIgnoreCase(getContentEncoding())
-                    ? new InflaterInputStream(in)
-                    : in;
+            InputStream in = new ProgressInputStream(getInputStream(), getContentLength(), monitor);
+            if ("gzip".equalsIgnoreCase(getContentEncoding())) {
+                in = new GZIPInputStream(in);
+            } else if ("deflate".equalsIgnoreCase(getContentEncoding())) {
+                in = new InflaterInputStream(in);
+            }
             Compression compression = Compression.NONE;
             if (uncompress) {