Skip to content
Browse files

Fixed RSpec issue on JRuby 1.7.x closes #217

This requires the latest neo4j-core (unreleased)
  • Loading branch information...
1 parent c8e120b commit 0104e3b44d86d095bd9254efa4d747d37bd72cc0 @andreasronge andreasronge committed Sep 26, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −1 CHANGELOG
  2. +3 −1 lib/neo4j/rails/persistence.rb
View
2 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
View
4 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

0 comments on commit 0104e3b

Please sign in to comment.
Something went wrong with that request. Please try again.