From 0104e3b44d86d095bd9254efa4d747d37bd72cc0 Mon Sep 17 00:00:00 2001
From: Andreas Ronge <andreas.ronge@gmail.com>
Date: Wed, 26 Sep 2012 12:13:36 +0200
Subject: [PATCH] Fixed RSpec issue on JRuby 1.7.x closes #217

This requires the latest neo4j-core (unreleased)
---
 CHANGELOG                      | 2 +-
 lib/neo4j/rails/persistence.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e9e2c1d8e..0139e4d9d 100644
--- 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
index 51ca6b09b..3233417e7 100644
--- 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