diff options
Diffstat (limited to 'lib/weakref.rb')
| -rw-r--r-- | lib/weakref.rb | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/weakref.rb b/lib/weakref.rb index 18b530f2ae..a6519e64c0 100644 --- a/lib/weakref.rb +++ b/lib/weakref.rb @@ -19,18 +19,24 @@ class WeakRef<Delegator ID_MAP = {} # obj -> [ref,...] ID_REV_MAP = {} # ref -> obj ObjectSpace.add_finalizer(lambda{|id| - rids = ID_MAP[id] - if rids - for rid in rids - ID_REV_MAP[rid] = nil + __old_status = Thread.critical + Thread.critical = true + begin + rids = ID_MAP[id] + if rids + for rid in rids + ID_REV_MAP[rid] = nil + end + ID_MAP[id] = nil end - ID_MAP[id] = nil - end - rid = ID_REV_MAP[id] - if rid - ID_REV_MAP[id] = nil - ID_MAP[rid].delete(id) - ID_MAP[rid] = nil if ID_MAP[rid].empty? + rid = ID_REV_MAP[id] + if rid + ID_REV_MAP[id] = nil + ID_MAP[rid].delete(id) + ID_MAP[rid] = nil if ID_MAP[rid].empty? + end + ensure + Thread.critical = __old_status end }) |