From ada014929b01af5ce8ca5e6fdd13401bc3c392f5 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Thu, 14 Oct 2010 13:24:26 -0300
Subject: Use ActiveSupport::WeakHash for MRI, JRuby prefers Weakling.

---
 activerecord/lib/active_record/identity_map.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index d7ba1d953c..9f95685816 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -1,3 +1,5 @@
+require "active_support/weak_hash"
+
 module ActiveRecord
   # = Active Record Identity Map
   #
@@ -23,7 +25,7 @@ module ActiveRecord
       attr_accessor :enabled
 
       def current
-        repositories[current_repository_name] ||= Hash.new { |h,k| h[k] = Weakling::WeakHash.new }
+        repositories[current_repository_name] ||= Hash.new { |h,k| h[k] = ActiveSupport::WeakHash.new }
       end
 
       def with_repository(name = :default)
-- 
cgit v1.2.3