Fixed RSpec issue on JRuby 1.7.x closes #217

This requires the latest neo4j-core (unreleased)
neo4jrb · Sep 26, 2012 · 0104e3b · 0104e3b
1 parent c8e120b
commit 0104e3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-
+* Fixed RSpec issue on JRuby 1.7.x #217
 * Aliased has_many to has_n, #183
 
 == 2.2.0.rc1 / 2012-09-21

diff --git a/lib/neo4j/rails/persistence.rb b/lib/neo4j/rails/persistence.rb
@@ -160,11 +160,13 @@ def create_or_update
         else
           true
         end
+      rescue => e
+        Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running?
+        raise e
       ensure
         @_create_or_updating = nil
       end
 
-
       def set_deleted_properties
         @_deleted = true
       end