From c2ca1e08565863b54e9ca661ff97feb32d1f5bef Mon Sep 17 00:00:00 2001
From: Jingwen Owen Ou <jingweno@gmail.com>
Date: Fri, 26 Aug 2011 07:27:08 -0700
Subject: [PATCH] Add mutex lock to transaction rollback

---
 .rvmrc => client/.rvmrc    | 0
 client/spec/spec_helper.rb | 3 +++
 server/.rvmrc              | 1 +
 3 files changed, 4 insertions(+)
 rename .rvmrc => client/.rvmrc (100%)
 create mode 100644 server/.rvmrc

diff --git a/.rvmrc b/client/.rvmrc
similarity index 100%
rename from .rvmrc
rename to client/.rvmrc
diff --git a/client/spec/spec_helper.rb b/client/spec/spec_helper.rb
index 675cd6c..6a4fa56 100644
--- a/client/spec/spec_helper.rb
+++ b/client/spec/spec_helper.rb
@@ -26,11 +26,13 @@
   config.use_transactional_fixtures = true
 
   config.before :all do
+    @semaphore = Mutex.new
     DRb.start_service
     @remote_base = DRbObject.new nil, "druby://localhost:8000"
   end
 
   config.before :each do
+    @semaphore.lock
     @remote_base.connection.increment_open_transactions
     @remote_base.connection.transaction_joinable = false
     @remote_base.connection.begin_db_transaction
@@ -40,5 +42,6 @@
     @remote_base.connection.rollback_db_transaction
     @remote_base.connection.decrement_open_transactions
     @remote_base.clear_active_connections!
+    @semaphore.unlock
   end
 end
diff --git a/server/.rvmrc b/server/.rvmrc
new file mode 100644
index 0000000..96fc0dd
--- /dev/null
+++ b/server/.rvmrc
@@ -0,0 +1 @@
+rvm use 1.9.2@testing_rest_web_services_client