Fixed due to different behaviour with stable iterations in 3.4

neo4j-contrib · Mar 19, 2018 · 2b757c9 · 2b757c9
1 parent e2da768
commit 2b757c9
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/main/java/org/neo4j/gis/spatial/osm/OSMImporter.java b/src/main/java/org/neo4j/gis/spatial/osm/OSMImporter.java
@@ -32,13 +32,7 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -270,7 +264,7 @@ public long reIndex( GraphDatabaseService database, int commitInterval,
             if ( useWays )
             {
                 beginProgressMonitor( dataset.getWayCount() );
-                for ( Node way : findWays.traverse(database.getNodeById( osm_dataset )).nodes() )
+                for (Node way : toList(findWays.traverse(database.getNodeById(osm_dataset)).nodes()))
                 {
                     updateProgressMonitor( count );
                     incrLogContext();
@@ -295,7 +289,7 @@ public long reIndex( GraphDatabaseService database, int commitInterval,
             else
             {
                 beginProgressMonitor( dataset.getChangesetCount() );
-                for ( Node changeset : dataset.getAllChangesetNodes() )
+                for (Node changeset : toList(dataset.getAllChangesetNodes()))
                 {
                     updateProgressMonitor( count );
                     incrLogContext();
@@ -330,6 +324,17 @@ public long reIndex( GraphDatabaseService database, int commitInterval,
         return count;
     }
 
+    private List<Node> toList(Iterable<Node> iterable)
+    {
+        ArrayList<Node> list = new ArrayList<>();
+        if(iterable != null) {
+            for(Node e: iterable) {
+                list.add(e);
+            }
+        }
+        return list;
+    }
+
     private static class GeometryMetaData
     {
         private Envelope bbox = null;