diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-13 07:14:07 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-13 07:14:07 +0000 |
commit | 6ef956ab90315f63d103bed0c3a7d9d2c0028019 (patch) | |
tree | 2e1c772b2e955c14abbb453618f504bd588d43fb /lib/pstore.rb | |
parent | f085a0b034484a621220bbaa66b3e8f61f2f870f (diff) |
* 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/trunk@31101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/pstore.rb')
-rw-r--r-- | lib/pstore.rb | 2 |
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 |