Changeset 1827 in josm for trunk/src/org

Timestamp:

2009-07-25T11:12:35+02:00 (15 years ago)

Author:

Gubaer

Message:

cleanup in exception handling

File:

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

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

@@ -32 +32 @@
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
         progressMonitor.beginTask("", 1);
+        InputStream in = null;
         try {
             progressMonitor.subTask(tr("Downloading OSM data..."));
@@ -42 +43 @@
             }
 
-            final InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
+            in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
             if (in == null)
                 return null;
             final OsmReader osm = OsmReader.parseDataSetOsm(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             final DataSet data = osm.getDs();
-
-            in.close();
-            activeConnection = null;
             return data;
-        } catch (IOException e) {
-            if (cancel)
-                return null;
-            throw new OsmTransferException(e);
-        } catch (SAXException e) {
-            throw new OsmTransferException(e);
         } catch(OsmTransferException e) {
+            if (cancel) return null;
             throw e;
         } catch (Exception e) {
-            if (cancel)
-                return null;
+            if (cancel) return null;
             throw new OsmTransferException(e);
         } finally {
             progressMonitor.finishTask();
+            if (in!=null) {
+                try {
+                    in.close();
+                } catch(Exception e) {}
+            }
+            activeConnection = null;
         }
     }