From fdd272f88227df112ef902426557455637b68739 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 22 Jan 2014 11:23:15 +0100 Subject: [PATCH] Fix conflict of Java web services with RoR development mode --- .../lib/action_controller/reloader.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb b/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb index a6f77484ab1..99bb061d268 100644 --- a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb +++ b/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb @@ -8,14 +8,20 @@ module ActionController class BodyWrapper def initialize(body, lock) @body = body - @lock = lock + #sonar + # Development mode does not work with integration of Java web services (java_ws_controller.rb). + #@lock = lock + #/sonar end def close @body.close if @body.respond_to?(:close) ensure Dispatcher.cleanup_application - @lock.unlock + #sonar + # Development mode does not work with integration of Java web services (java_ws_controller.rb). + #@lock.unlock + #/sonar end def method_missing(*args, &block) -- 2.39.5