Fixed #7096

orientechnologies · Feb 14, 2017 · c555779 · c555779
1 parent 68dbbac
commit c555779
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientDynaElementIterator.java b/graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientDynaElementIterator.java
@@ -73,6 +73,10 @@ public Object next() {
         currentElement = graph.getVertex(currentDocument);
     }
 
+    if(currentElement==null){
+      return current;
+    }
+
     return currentElement;
   }