Skip to content

Commit

Permalink
Merge pull request #1485 from padrino/patch-863
Browse files Browse the repository at this point in the history
temporarily fix #863
  • Loading branch information
ujifgc committed Nov 8, 2013
2 parents 457f255 + 0d1083f commit 0ebce3a
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions padrino-core/lib/padrino-core/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ def logger
Padrino.logger
end

# TODO: Remove this hack after getting rid of thread-unsafe http_houter:
alias_method :original_call, :call
def call(*args)
settings.init_mutex.synchronize do
instance_eval{ undef :call }
class_eval{ alias_method :call, :original_call }
instance_eval{ undef :original_call }
super(*args)
end
end

class << self
def inherited(base)
begun_at = Time.now
Expand Down Expand Up @@ -205,6 +216,9 @@ def default_configuration!
set :method_override, true
set :default_builder, 'StandardFormBuilder'

# TODO: Remove this hack after getting rid of thread-unsafe http_houter:
set :init_mutex, Mutex.new

default_paths!
default_security!
global_configuration!
Expand Down

0 comments on commit 0ebce3a

Please sign in to comment.