Changeset 12091 in josm

Timestamp:

2017-05-09T20:02:36+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14762 - NPE

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1301 +1301 @@
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         DataSet ds = getLayerManager().getEditDataSet();
-        return ds != null ? ds.getSelected() : null;
+        return ds != null ? ds.getSelected() : Collections.emptySet();
     }
 

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -100 +101 @@
         }
     }
+
+    /**
+     * Non regression test case for bug #14762.
+     */
+    @Test
+    public void testTicket14762() {
+        DrawAction action = new DrawAction();
+        assertNull(action.getLayerManager().getEditDataSet());
+        assertEquals(0, action.getPreservedPrimitives().size());
+    }
 }