lib/neo4j/database.rb in neo4j-1.0.0.beta.2 vs lib/neo4j/database.rb in neo4j-1.0.0.beta.3

@@ -6,21 +6,24 @@
       @event_handler = EventHandler.new
     end
 
 
     def start
-      @running = true
       @graph = org.neo4j.kernel.EmbeddedGraphDatabase.new(Config[:storage_path])
       @lucene = org.neo4j.index.impl.lucene.LuceneIndexProvider.new(@graph)
       @graph.register_transaction_event_handler(@event_handler)
+      @running = true
       @event_handler.neo4j_started(self)
+      at_exit { shutdown }
     end
 
     def shutdown
-      @running = false
-      @graph.unregister_transaction_event_handler(@event_handler)
-      @event_handler.neo4j_shutdown(self)
+      if @running
+        @graph.unregister_transaction_event_handler(@event_handler)
+        @event_handler.neo4j_shutdown(self)
+      end
       @graph.shutdown
+      @running = false
     end
 
     def running?
       @running
     end