Changeset 18133 in josm for trunk/src

Timestamp:

2021-08-15T13:24:41+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21223 - fix NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionSaveAsAction.java (modified) (2 diffs)
• io/session/GpxTracksSessionExporter.java (modified) (1 diff)
• io/session/SessionWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -44 +44 @@
 import org.openstreetmap.josm.io.session.SessionWriter;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -210 +211 @@
 
             for (Layer layer : layers) {
-                SessionLayerExporter exporter = SessionWriter.getSessionLayerExporter(layer);
+                SessionLayerExporter exporter = null;
+                try {
+                    exporter = SessionWriter.getSessionLayerExporter(layer);
+                } catch (IllegalArgumentException | JosmRuntimeException e) {
+                    Logging.error(e);
+                }
                 if (exporter != null) {
                     exporters.put(layer, exporter);

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java

@@ -27 +27 @@
     protected GpxTracksSessionExporter(GpxLayer layer, String type) {
         super(layer, type, "0.1", "gpx");
+        if (layer.data == null) {
+            throw new IllegalArgumentException("GPX layer without data: " + layer);
+        }
     }
 

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -97 +97 @@
      * @param layer layer to export
      * @return session layer exporter for the given layer
+     * @throws IllegalArgumentException if layer cannot be exported
      */
     public static SessionLayerExporter getSessionLayerExporter(Layer layer) {