Reverted change that made WSF_URI_FILTER_HANDLER and WSF_URI_TEMPLATE_FILTER_HANDLER inheriting from WSF_EXECUTE_FILTER_HANDLER as it breaks existing projects using EiffelWeb.

2017-11-13 18:58:29 +01:00
parent 5fedad7f2e
commit 603bedf71d
3 changed files with 28 additions and 7 deletions
--- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e
+++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e
@@ -8,10 +8,19 @@ deferred class
 	WSF_URI_TEMPLATE_FILTER_HANDLER

 inherit
-	WSF_EXECUTE_FILTER_HANDLER
+	WSF_FILTER_HANDLER [WSF_URI_TEMPLATE_HANDLER]

 	WSF_URI_TEMPLATE_HANDLER

+feature -- Execution
+
+	execute_next (req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			if attached next as n then
+				n.execute (req, res)
+			end
+		end
+
 note
 	copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"