Changeset 9680 in josm

Timestamp:

2016-01-29T22:52:01+01:00 (9 years ago)

Author:

Don-vip

Message:

fix NPE seen in unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -200 +200 @@
     public void update(Observable o, Object arg) {
         HistoryOsmPrimitive primitive = getPrimitive();
-        Changeset cs = primitive.getChangeset();
-        update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
+        if (primitive != null) {
+            Changeset cs = primitive.getChangeset();
+            update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java

@@ -49 +49 @@
 
     private static void test(ImageryType expected, TMSLayer layer) {
-        Main.main.addLayer(layer);
         try {
+            Main.main.addLayer(layer);
             assertEquals(expected, layer.getInfo().getImageryType());
         } finally {