diff options
| author | Aliaksey Kandratsenka <alk@tut.by> | 2008-10-02 21:06:22 +0300 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-10-04 18:25:08 +0200 |
| commit | b437a7d34e86c16a211171d491e805b603f0dc99 (patch) | |
| tree | ecbb3fa54c96c38e492d9fcbd8f677718d0ef0af /actionpack/lib/action_controller/base.rb | |
| parent | f550c8625739106e957e4260d3d592a9665fc943 (diff) | |
| download | rails-b437a7d34e86c16a211171d491e805b603f0dc99.tar.gz rails-b437a7d34e86c16a211171d491e805b603f0dc99.tar.bz2 rails-b437a7d34e86c16a211171d491e805b603f0dc99.zip | |
Return processing lock to dispatcher, the finer grained lock was incompatible with the reloading in development mode.
This commit also adds ActionController::Dispatcher#dispatch_unlocking -- non-locking version of dispatch.
It's named anologously to POSIX {getc,getchar,...}_unlocked functions.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1170 state:committed]
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 976bd98bfa..e99e828730 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -290,8 +290,6 @@ module ActionController #:nodoc: @@allow_concurrency = false cattr_accessor :allow_concurrency - @@guard = Monitor.new - # Modern REST web services often need to submit complex data to the web application. # The <tt>@@param_parsers</tt> hash lets you register handlers which will process the HTTP body and add parameters to the # <tt>params</tt> hash. These handlers are invoked for POST and PUT requests. @@ -532,12 +530,7 @@ module ActionController #:nodoc: assign_names log_processing - - if @@allow_concurrency - send(method, *arguments) - else - @@guard.synchronize { send(method, *arguments) } - end + send(method, *arguments) send_response ensure |