Changeset 7628 in josm for trunk/src

Timestamp:

2014-10-17T00:45:28+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #5934 - error handling missing, when nominatim server returns garbage

File:

• trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -31 +31 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -50 +51 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -61 +64 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -379 +383 @@
                     this.data = parser.getResult();
                 }
-            } catch(Exception e) {
-                if (canceled)
-                    // ignore exception
-                    return;
-                OsmTransferException ex = new OsmTransferException(e);
-                ex.setUrl(urlString);
-                lastException = ex;
+            } catch (SAXParseException e) {
+                if (!canceled) {
+                    // Nominatim sometimes returns garbage, see #5934, #10643
+                    Main.warn(tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()));
+                    GuiHelper.runInEDTAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            HelpAwareOptionPane.showOptionDialog(
+                                    Main.parent,
+                                    tr("Name server returned invalid data. Please try again."),
+                                    tr("Bad response"),
+                                    JOptionPane.WARNING_MESSAGE, null
+                            );
+                        }
+                    });
+                }
+            } catch (Exception e) {
+                if (!canceled) {
+                    OsmTransferException ex = new OsmTransferException(e);
+                    ex.setUrl(urlString);
+                    lastException = ex;
+                }
             }
         }