Do call next on cursor...please

neo4j · Feb 25, 2018 · c33ca59 · c33ca59
1 parent 773d7eb
commit c33ca59
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/...in/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/...in/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala
@@ -489,24 +489,30 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona
     val group = transactionalContext.cursors.allocateRelationshipGroupCursor()
     try {
       reads().singleNode(node, cursor)
-      dir match {
-        case OUTGOING => Nodes.countOutgoing(cursor, group)
-        case INCOMING => Nodes.countIncoming(cursor, group)
-        case BOTH => Nodes.countAll(cursor, group)
+      if (!cursor.next()) 0
+      else {
+        dir match {
+          case OUTGOING => Nodes.countOutgoing(cursor, group)
+          case INCOMING => Nodes.countIncoming(cursor, group)
+          case BOTH => Nodes.countAll(cursor, group)
+        }
       }
-    } finally group.close()
-
+    }
+    finally group.close()
   }
 
   override def nodeGetDegree(node: Long, dir: SemanticDirection, relTypeId: Int): Int = {
     val cursor = nodeCursor
     val group = transactionalContext.cursors.allocateRelationshipGroupCursor()
     try {
       reads().singleNode(node, cursor)
-      dir match {
-        case OUTGOING => Nodes.countOutgoing(cursor, group, relTypeId)
-        case INCOMING => Nodes.countIncoming(cursor, group, relTypeId)
-        case BOTH => Nodes.countAll(cursor, group, relTypeId)
+      if (!cursor.next()) 0
+      else {
+        dir match {
+          case OUTGOING => Nodes.countOutgoing(cursor, group, relTypeId)
+          case INCOMING => Nodes.countIncoming(cursor, group, relTypeId)
+          case BOTH => Nodes.countAll(cursor, group, relTypeId)
+        }
       }
     } finally group.close()
   }