990324

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

1 files changed, 11 insertions, 7 deletions

diff --git a/lib/weakref.rb b/lib/weakref.rb
index d53aa15c71..d969553090 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -2,11 +2,12 @@
 #
 # Usage:
 #   foo = Object.new
-#   foo.hash
+#   foo = Object.new
+#   p foo.to_s			# original's class
 #   foo = WeakRef.new(foo)
-#   foo.hash
+#   p foo.to_s			# should be same class
 #   ObjectSpace.garbage_collect
-#   foo.hash	# => Raises WeakRef::RefError (because original GC'ed)
+#   p foo.to_s			# should raise exception (recycled)
 
 require "delegate"
 
@@ -18,9 +19,11 @@ class WeakRef<Delegator
   ID_MAP =  {}
   ID_REV_MAP =  {}
   ObjectSpace.add_finalizer(lambda{|id|
-			      rid = ID_MAP[id]
-			      if rid
-				ID_REV_MAP[rid] = nil
+			      rids = ID_MAP[id]
+			      if rids
+				for rid in rids
+				  ID_REV_MAP[rid] = nil
+				end
 				ID_MAP[id] = nil
 			      end
 			      rid = ID_REV_MAP[id]
@@ -35,7 +38,8 @@ class WeakRef<Delegator
     @__id = orig.__id__
     ObjectSpace.call_finalizer orig
     ObjectSpace.call_finalizer self
-    ID_MAP[@__id] = self.__id__
+    ID_MAP[@__id] = [] unless ID_MAP[@__id]
+    ID_MAP[@__id].concat self.__id__
     ID_REV_MAP[self.id] = @__id
   end