merges r31101 from trunk into ruby_1_9_2.

--
* lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
  is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]

* test/test_pstore.rb: Test for above.
  Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index 3114eb567f..9fb0249f3c 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -341,6 +341,8 @@ class PStore
       end
     end
     value
+  rescue ThreadError
+    raise PStore::Error, "nested transaction"
   end
 
   private