aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionwebservice/CHANGELOG2
-rw-r--r--actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb8
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)