Changeset 10223 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-05-16T04:05:58+02:00 (10 years ago)

Author:

Don-vip

Message:

findbugs: DP_DO_INSIDE_DO_PRIVILEGED + UWF_UNWRITTEN_FIELD + RC_REF_COMPARISON + OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• Compression.java (modified) (2 diffs)
• OsmReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/Compression.java

@@ -96 +96 @@
      * @throws IOException if any I/O error occurs
      */
-    @SuppressWarnings("resource")
     public static InputStream getUncompressedFileInputStream(File file) throws IOException {
-        return byExtension(file.getName()).getUncompressedInputStream(new FileInputStream(file));
+        FileInputStream in = new FileInputStream(file);
+        try {
+            return byExtension(file.getName()).getUncompressedInputStream(in);
+        } catch (IOException e) {
+            Utils.close(in);
+            throw e;
+        }
     }
 
@@ -129 +134 @@
      * @throws IOException if any I/O error occurs
      */
-    @SuppressWarnings("resource")
     public static OutputStream getCompressedFileOutputStream(File file) throws IOException {
-        return byExtension(file.getName()).getCompressedOutputStream(new FileOutputStream(file));
+        FileOutputStream out = new FileOutputStream(file);
+        try {
+            return byExtension(file.getName()).getCompressedOutputStream(out);
+        } catch (IOException e) {
+            Utils.close(out);
+            throw e;
+        }
     }
 }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -355 +356 @@
         }
         // Read changeset info if neither upload-changeset nor id are set, or if they are both set to the same value
-        if (id == uploadChangesetId || (id != null && id.equals(uploadChangesetId))) {
+        if (Objects.equals(id, uploadChangesetId)) {
             uploadChangeset = new Changeset(id != null ? id.intValue() : 0);
             while (true) {