Changeset 14088 in josm for trunk

Timestamp:

2018-08-05T16:47:40+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16546 - simplify exception chaining to keep existing unit tests as it

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (6 diffs)

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

@@ -137 +137 @@
     }
 
+    private void handleIllegalDataException(IllegalDataException e) throws XMLStreamException {
+        if (e.getCause() instanceof XMLStreamException) {
+            throw (XMLStreamException) e.getCause();
+        } else {
+            throwException(e);
+        }
+    }
+
     private void parseBounds(String generator) throws XMLStreamException {
         String minlon = parser.getAttributeValue(null, "minlon");
@@ -146 +154 @@
             parseBounds(generator, minlon, minlat, maxlon, maxlat, origin);
         } catch (IllegalDataException e) {
-            throwException(e);
+            handleIllegalDataException(e);
         }
         jumpToEnd();
@@ -157 +165 @@
             return parseNode(lat, lon, this::readCommon, this::parseNodeTags);
         } catch (IllegalDataException e) {
-            throwException(e);
+            handleIllegalDataException(e);
         }
         return null;
@@ -185 +193 @@
             return parseWay(this::readCommon, this::parseWayNodesAndTags);
         } catch (IllegalDataException e) {
-            throwException(e);
+            handleIllegalDataException(e);
         }
         return null;
@@ -234 +242 @@
             return parseRelation(this::readCommon, this::parseRelationMembersAndTags);
         } catch (IllegalDataException e) {
-            throw new XMLStreamException(e);
-        }
+            handleIllegalDataException(e);
+        }
+        return null;
     }
 
@@ -271 +280 @@
             jumpToEnd();
         } catch (IllegalDataException e) {
-            throwException(e);
+            handleIllegalDataException(e);
         }
         return result;