Changeset 30990 in osm for applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

Timestamp:

2015-02-15T19:32:00+01:00 (10 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm1083 - robustness to revert of redacted objects

File:

• applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -16 +17 @@
 public class OsmServerMultiObjectReader extends OsmServerReader {
     private final MultiOsmReader rdr = new MultiOsmReader();
-    
+
     public void readObject(PrimitiveId id, int version, ProgressMonitor progressMonitor) throws OsmTransferException {
         readObject(id.getUniqueId(), version, id.getType(), progressMonitor);
     }
-    
+
     public void readObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException {
         StringBuffer sb = new StringBuffer();
@@ -31 +32 @@
         try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
             rdr.addData(in);
-        } catch (Exception e) {
+        } catch (IOException | IllegalDataException e) {
             throw new OsmTransferException(e);
         } finally {