From cdc725a6a7c496db1172bba7df0f98b149119fce Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Mon, 2 Apr 2007 19:53:47 +0000 Subject: [PATCH] order of scopes was messed up --- .../executor/jsf/FlowExecutionPropertyResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java index e49d3c2e..591e87b0 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionPropertyResolver.java @@ -133,11 +133,11 @@ public class FlowExecutionPropertyResolver extends PropertyResolver { } FlowExecution execution = (FlowExecution) base; if (FLASH_SCOPE_PROPERTY.equals(property)) { - return execution.getActiveSession().getScope().asMap(); - } else if (FLOW_SCOPE_PROPERTY.equals(property)) { - return execution.getConversationScope().asMap(); - } else if (CONVERSATION_SCOPE_PROPERTY.equals(property)) { return execution.getActiveSession().getFlashMap().asMap(); + } else if (FLOW_SCOPE_PROPERTY.equals(property)) { + return execution.getActiveSession().getFlashMap().asMap(); + } else if (CONVERSATION_SCOPE_PROPERTY.equals(property)) { + return execution.getConversationScope().asMap(); } else { // perform an attribute search String attributeName = (String)property;