From 2fd48c8d06d3cb96a95692196cb82e85aadd4631 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Thu, 18 Nov 2010 09:47:32 -0300
Subject: 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
---
 activerecord/lib/active_record/identity_map.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index 7adb4e1c71..e38524230b 100644
--- 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 ActiveRecord
     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
-- 
cgit v1.2.3