Changeset 4800 in josm

Timestamp:

2012-01-15T23:44:04+01:00 (12 years ago)

Author:

Don-vip

Message:

Fix NPE with custom importers returning null dataSets

File:

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

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

@@ -11 +11 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -68 +67 @@
     public void loadLayer(InputStream in, final File associatedFile, final String layerName, ProgressMonitor progressMonitor) throws IllegalDataException {
         final DataSet dataSet = parseDataSet(in, progressMonitor);
+        if (dataSet == null) {
+            throw new IllegalDataException(tr("Invalid dataset"));
+        }
         layer = createLayer(dataSet, associatedFile, layerName);
         postLayerTask = createPostLayerTask(dataSet, associatedFile, layerName);