Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

Timestamp:

2013-04-16T19:57:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570, #7406 - I/O refactorization:

• Move different file copy functions to Utils.copyFile (to be replaced later by Files.copy when switching to Java 7)
• Replace all Utils.close(XXX) by Utils.close(Closeable) -> impacted plugins: commandline, mirrored_download, opendata, piclayer
• Add new Utils.close(ZipFile)
• Use of Utils.close almost everywhere
• Javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -40 +41 @@
         } finally {
             progressMonitor.finishTask();
-            try {
-                activeConnection = null;
-                if (parser.in != null) {
-                    parser.in.close();
-                    parser.in = null;
-                }
-            } catch(Exception e) {/* ignore it */}
+            activeConnection = null;
+            Utils.close(parser.in);
+            parser.in = null;
         }
     }