diff options
author | Kent Sibilev <ksibilev@gmail.com> | 2006-09-25 05:20:13 +0000 |
---|---|---|
committer | Kent Sibilev <ksibilev@gmail.com> | 2006-09-25 05:20:13 +0000 |
commit | 133fe85f2baa54a676157c0598d6c7c5f8d78a96 (patch) | |
tree | 8318e7f5c289d6ead999ffaa45aaa4981f63f3af /actionwebservice | |
parent | 83d972e365963f44e4b1dd100a7c9c55a77e6d41 (diff) | |
download | rails-133fe85f2baa54a676157c0598d6c7c5f8d78a96.tar.gz rails-133fe85f2baa54a676157c0598d6c7c5f8d78a96.tar.bz2 rails-133fe85f2baa54a676157c0598d6c7c5f8d78a96.zip |
Removed invocation of deprecated before_action and around_action filter methods.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5179 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice')
-rw-r--r-- | actionwebservice/CHANGELOG | 2 | ||||
-rw-r--r-- | actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index d49fc60b16..65297433fb 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Removed invocation of deprecated before_action and around_action filter methods. Corresponding before_invocation and after_invocation methods should be used instead. #6275 [Kent Sibilev] + * Provide access to the underlying SOAP driver. #6212 [bmilekic, Kent Sibilev] * Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark] diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb index 2c7d5a0948..85773a617d 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb @@ -106,13 +106,7 @@ module ActionWebService # :nodoc: invocation.method_named_params.each do |name, value| params[name] = value end - params['action'] = invocation.api_method.name.to_s - if before_action == false - raise(DispatcherError, "Method filtered") - end - return_value = web_service_direct_invoke_without_controller(invocation) - after_action - return_value + web_service_direct_invoke_without_controller(invocation) end def log_request(ws_request, body) |