Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge commit 'rails/3-0-unstable'

  • Loading branch information...
commit 6faff0223b4470a6c1c66664f1b3df94de206841 2 parents 44cdf0c + 4945d92
@wycats wycats authored
View
1  actionpack/lib/action_dispatch/http/request.rb
@@ -3,7 +3,6 @@
require 'strscan'
require 'active_support/memoizable'
-require 'action_controller/cgi_ext'
module ActionDispatch
class Request < Rack::Request
View
25 activesupport/lib/active_support/memoizable.rb
@@ -1,29 +1,4 @@
module ActiveSupport
- class ConcurrentHash
- def initialize(hash = {})
- @backup_cache = hash.dup
- @frozen_cache = hash.dup.freeze
- @mutex = Mutex.new
- end
-
- def []=(k,v)
- @mutex.synchronize { @backup_cache[k] = v }
- @frozen_cache = @backup_cache.dup.freeze
- end
-
- def [](k)
- if @frozen_cache.key?(k)
- @frozen_cache[k]
- else
- @mutex.synchronize { @backup_cache[k] }
- end
- end
-
- def empty?
- @backup_cache.empty?
- end
- end
-
module SafelyMemoizable
def safely_memoize(*symbols)
symbols.each do |symbol|
Please sign in to comment.
Something went wrong with that request. Please try again.