Implement safer WeakMap based on WeakRef

droonga · Nov 21, 2014 · aa10780 · aa10780
1 parent 1c8833c
commit aa10780
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/droonga/buffered_tcp_socket.rb b/lib/droonga/buffered_tcp_socket.rb
@@ -114,16 +114,18 @@ class Chunk
       else
         # XXX Ruby 1.9.x (installed by default on Ubuntu 14.0.4LTS etc.)
         #     doesn't have WeakMap...
+        require "weakref"
+
         class WeakMap
           def initialize
             @ids = {}
           end
 
           def [](key)
-            value_object_id = @ids[key.object_id]
-            if value_object_id
+            value_ref = @ids[key.object_id]
+            if value_ref and value_ref.weakref_alive?
               begin
-                ObjectSpace._id2ref(value_object_id)
+                value_ref.__getobj__
               rescue RangeError
                 nil
               end
@@ -133,7 +135,8 @@ def [](key)
           end
 
           def []=(key, value)
-            @ids[key.object_id] = value.object_id
+            ref = WeakRef.new(value)
+            @ids[key.object_id] = ref
             value
           end
         end