From dbfe14e77ec17211b7871d70ef6b0aeb35e28d17 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Fri, 17 Mar 2017 11:21:21 +0100
Subject: [PATCH] Fixed cms execution initialization (avoid setting up twice
 router and filter).

---
 src/service/cms_execution.e | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/service/cms_execution.e b/src/service/cms_execution.e
index f2e03c5..d74fcf6 100644
--- a/src/service/cms_execution.e
+++ b/src/service/cms_execution.e
@@ -18,7 +18,9 @@ inherit
 			create_router, router,
 			execute_default,
 			filter_execute,
-			initialize
+			initialize,
+			initialize_router,
+			initialize_filter
 		end
 
 	WSF_NO_PROXY_POLICY
@@ -59,11 +61,24 @@ feature {NONE} -- Initialization
 
 				-- CMS Initialization
 
-				-- initialize_router
-				-- initialize_filter: expanded here, for void-safety concern.
+				-- for void-safety concern.
+			create {WSF_MAINTENANCE_FILTER} filter
+		end
+
+	initialize_router
+			-- Initialize `router`.
+		do
+			create_router
+				-- router setup is delayed toi `initialize_execution`.
+			-- setup_router
+		end
+
+	initialize_filter
+			-- Initialize `filter`.
+		do
 			create_filter
-			initialize_router
-			setup_filter
+				-- filter setup is delayed toi `initialize_execution`.
+			-- setup_filter
 		end
 
 	initialize_modules
@@ -202,6 +217,8 @@ feature -- Request execution
 			-- Initialize CMS execution.
 		do
 			request.set_uploaded_file_path (api.temp_location)
+			setup_filter
+			setup_router
 		end
 
 	execute