Timeboxed connectedness check in 'cd'

peterneubauer · Jul 8, 2011 · a35f330 · a35f330
1 parent ca5cfda
commit a35f330
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/shell/src/main/java/org/neo4j/shell/kernel/apps/Cd.java b/shell/src/main/java/org/neo4j/shell/kernel/apps/Cd.java
@@ -303,6 +303,7 @@ private boolean isConnected( NodeOrRelationship current, TypedId newId )
         if ( current.isNode() )
         {
             Node currentNode = current.asNode();
+            long startTime = System.currentTimeMillis();
             for ( Relationship rel : currentNode.getRelationships() )
             {
                 if ( newId.isNode() )
@@ -320,6 +321,11 @@ private boolean isConnected( NodeOrRelationship current, TypedId newId )
                         return true;
                     }
                 }
+                if ( System.currentTimeMillis()-startTime > 350 )
+                {
+                    // DOn't spend too long time in here
+                    return true;
+                }
             }
         }
         else