Revert "Use ActiveSupport::WeakHash for MRI, JRuby prefers Weakling."

This reverts commit 3cddebc2402eb71f2806e8b2119dc3efdceb4662. Conflicts: activerecord/lib/active_record/identity_map.rb activesupport/lib/active_support/weak_hash.rb
rails · Nov 19, 2010 · 2fd48c8 · 2fd48c8
1 parent 421643b
commit 2fd48c8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
@@ -1,5 +1,3 @@
-require "active_support/weak_hash"
-
 module ActiveRecord
   # = Active Record Identity Map
   #
@@ -22,8 +20,8 @@ module IdentityMap
     class << self
       attr_accessor :enabled
 
-      def repository
-        Thread.current[:identity_map] ||= Hash.new { |h,k| h[k] = ActiveSupport::WeakHash.new }
+      def current
+        Thread.current[:identity_map] ||= Hash.new { |h,k| h[k] = Weakling::WeakHash.new }
       end
 
       def use