Changeset 9912 in josm for trunk

Timestamp:

2016-03-02T13:08:00+01:00 (9 years ago)

Author:

simon04

Message:

fix #12587 - fix NPE in HttpClient

File:

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

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

@@ -271 +271 @@
                 if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
                     final String contentDisposition = getHeaderField("Content-Disposition");
-                    final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(contentDisposition);
+                    final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(contentDisposition != null ? contentDisposition : "");
                     if (matcher.find()) {
                         Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);