Changeset 5635 in josm for trunk/src/org

Timestamp:

2012-12-27T00:48:51+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8278 - Robustness in capabilities cache parsing at startup

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (4 diffs)

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

@@ -25 +25 @@
 import java.util.HashMap;
 
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
@@ -40 +41 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -216 +218 @@
         cancel = false;
         try {
-            String s = new CapabilitiesCache(monitor, fastFail).updateIfRequiredString();
-            InputSource inputSource = new InputSource(new StringReader(s));
-            SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new CapabilitiesParser());
+            CapabilitiesCache cache = new CapabilitiesCache(monitor, fastFail);
+            try {
+                initializeCapabilities(cache.updateIfRequiredString());
+            } catch (SAXParseException parseException) {
+                // XML parsing may fail if JOSM previously stored a corrupted capabilities document (see #8278)
+                // In that case, force update and try again
+                initializeCapabilities(cache.updateForceString());
+            }
             if (capabilities.supportsVersion("0.6")) {
                 version = "0.6";
@@ -261 +268 @@
             throw new OsmApiInitializationException(e);
         }
+    }
+    
+    private void initializeCapabilities(String xml) throws SAXException, IOException, ParserConfigurationException {
+        InputSource inputSource = new InputSource(new StringReader(xml));
+        SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new CapabilitiesParser());
     }