diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/delegate.rb | 2 | ||||
| -rw-r--r-- | lib/weakref.rb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index 29f2a5ded2..480e1ef6b8 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -39,7 +39,7 @@ class Delegator raise end end - EOS + EOS end end diff --git a/lib/weakref.rb b/lib/weakref.rb index 9e510d6f1c..459f69f924 100644 --- a/lib/weakref.rb +++ b/lib/weakref.rb @@ -45,7 +45,13 @@ class WeakRef<Delegator @__id = orig.__id__ ObjectSpace.define_finalizer orig, @@final ObjectSpace.define_finalizer self, @@final - ID_MAP[@__id] = [] unless ID_MAP[@__id] + __old_status = Thread.critical + begin + Thread.critical = true + ID_MAP[@__id] = [] unless ID_MAP[@__id] + ensure + Thread.critical = __old_status + end ID_MAP[@__id].push self.__id__ ID_REV_MAP[self.id] = @__id end |