fix NPE in CH preparation with GenericWeighting (graphhopper#906)

stefanholder · Dec 10, 2016 · fa94e48 · fa94e48
1 parent 776fdb2
commit fa94e48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/weighting/GenericWeighting.java b/core/src/main/java/com/graphhopper/routing/weighting/GenericWeighting.java
@@ -162,6 +162,8 @@ public String getName() {
      * Use this method to associate a graph with this weighting to calculate e.g. node locations too.
      */
     public void setGraph(Graph graph) {
+        if(graph == null)
+            return;
         this.na = graph.getNodeAccess();
     }
 }
diff --git a/core/src/test/java/com/graphhopper/routing/weighting/GenericWeightingTest.java b/core/src/test/java/com/graphhopper/routing/weighting/GenericWeightingTest.java
@@ -106,4 +106,11 @@ public void testCalcTime() {
         EdgeIteratorState edge = graph.getEdgeIteratorState(0, 1);
         assertEquals(edgeWeight, weighting.calcMillis(edge, false, EdgeIterator.NO_EDGE), .1);
     }
+
+    @Test
+    public void testNullGraph() {
+        ConfigMap cMap = encoder.readStringMap(new PMap());
+        GenericWeighting weighting = new GenericWeighting(encoder, cMap);
+        weighting.setGraph(null);
+    }
 }