Changeset 14440 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-11-22T00:06:51+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17018 - NPE

Location:

trunk/src/org/openstreetmap/josm/data/projection/datum

Files:

• NTV2Datum.java (modified) (2 diffs)
• NTV2GridShiftFileWrapper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java

@@ -3 +3 @@
 
 import java.io.IOException;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -25 +26 @@
     public NTV2Datum(String name, String proj4Id, Ellipsoid ellps, NTV2GridShiftFileWrapper nadgrids) {
         super(name, proj4Id, ellps);
-        this.nadgrids = nadgrids;
+        this.nadgrids = Objects.requireNonNull(nadgrids);
     }
 

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -6 +6 @@
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
+
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -43 +46 @@
      */
     public NTV2GridShiftFileWrapper(String filename) {
-        this.gridFileName = filename;
+        this.gridFileName = Objects.requireNonNull(filename);
     }
 
@@ -65 +68 @@
                 }
             }
+            if (instance == null) {
+                Logging.error("Unable to find NTV2 grid shift file for {0}", gridFileName);
+            }
         }
         return instance;