remove patch for unsafe http_router and jruby, closes #863

padrino · Jan 11, 2015 · 2a2803a · 2a2803a
1 parent 6ca6844
commit 2a2803a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/padrino-core/lib/padrino-core/application.rb b/padrino-core/lib/padrino-core/application.rb
@@ -26,19 +26,6 @@ def logger
       Padrino.logger
     end
 
-    # TODO: Remove this hack (issue #863) after getting rid of thread-unsafe http_router:
-    if RUBY_PLATFORM == "java"
-      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
-    end
-
     class << self
       def inherited(base)
         begun_at = Time.now

diff --git a/padrino-core/lib/padrino-core/application/application_setup.rb b/padrino-core/lib/padrino-core/application/application_setup.rb
@@ -22,11 +22,6 @@ def default_configuration!
         set :method_override, true
         set :default_builder, 'StandardFormBuilder'
 
-        # TODO: Remove this hack after getting rid of thread-unsafe http_router:
-        if RUBY_PLATFORM == "java"
-          set :init_mutex, Mutex.new
-        end
-
         default_paths
         default_security
         global_configuration