Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 2fd48c8d06d3cb96a95692196cb82e85aadd4631 1 parent 421643b
Emilio Tagua miloops authored
Showing with 2 additions and 4 deletions.
  1. +2 −4 activerecord/lib/active_record/identity_map.rb
6 activerecord/lib/active_record/identity_map.rb
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.