Changeset 14524 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

Timestamp:

2018-12-08T21:45:30+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16073 - fix NPE

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -193 +193 @@
 
     private static Projection getProjection(ImageryInfo info) {
-        return info.getServerProjections().isEmpty() ? ProjectionRegistry.getProjection() :
-            Projections.getProjectionByCode(info.getServerProjections().get(0));
+        if (!info.getServerProjections().isEmpty()) {
+            Projection proj = Projections.getProjectionByCode(info.getServerProjections().get(0));
+            if (proj != null) {
+                return proj;
+            }
+        }
+        return ProjectionRegistry.getProjection();
     }