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

Timestamp:

2016-12-12T02:28:14+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• HttpClient.java (modified) (2 diffs)
• WindowGeometry.java (modified) (1 diff)

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

@@ -209 +209 @@
                         ) {
                     String content = this.fetchContent();
-                    if (content == null || content.isEmpty()) {
+                    if (content.isEmpty()) {
                         Main.debug("Server did not return any body");
                     } else {
@@ -289 +289 @@
                 }
             }
-            if (in != null) {
-                in = new ProgressInputStream(in, getContentLength(), monitor);
-                in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
-                Compression compression = Compression.NONE;
-                if (uncompress) {
-                    final String contentType = getContentType();
-                    Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
-                    compression = Compression.forContentType(contentType);
-                }
-                if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
-                    final String contentDisposition = getHeaderField("Content-Disposition");
-                    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);
-                        compression = Compression.byExtension(matcher.group(1));
-                    }
-                }
-                in = compression.getUncompressedInputStream(in);
-            }
+            in = new ProgressInputStream(in, getContentLength(), monitor);
+            in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            Compression compression = Compression.NONE;
+            if (uncompress) {
+                final String contentType = getContentType();
+                Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
+                compression = Compression.forContentType(contentType);
+            }
+            if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
+                final String contentDisposition = getHeaderField("Content-Disposition");
+                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);
+                    compression = Compression.byExtension(matcher.group(1));
+                }
+            }
+            in = compression.getUncompressedInputStream(in);
             return in;
         }

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

@@ -204 +204 @@
     protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException {
         String value = Main.pref.get(preferenceKey);
-        if (value == null || value.isEmpty())
+        if (value.isEmpty())
             throw new WindowGeometryException(
                     tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));