1 files changed, 7 insertions, 4 deletions
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index ff3dc252..4ae97acf 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -45,10 +45,13 @@ public class EvaluateCountrySelectionTask extends AbstractAuthServletTask {
 				while(reqParamNames.hasMoreElements()) {
 					String paramName = reqParamNames.nextElement();
 					if (StringUtils.isNotEmpty(paramName) && 
-							!EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName))
-						executionContext.put(paramName, 
-								StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
-				
+							!EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
+						for (String el : MSeIDASNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST) {
+							if (el.equalsIgnoreCase(paramName))
+								executionContext.put(paramName, 
+										StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
+						}
+					}
 				}    	    			
 				log.info("Country selection finished. Starting auth. process for country ... ");