Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added active check (SWF-282 patch)

Browse Source
This commit is contained in:
Keith Donald
2007-04-06 13:50:38 +00:00
parent b3f792c2bc
commit 33d3d2b8eb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/DelegatingFlowVariableResolver.java
View File

@@ -68,7 +68,8 @@ public class DelegatingFlowVariableResolver extends VariableResolver {
*/
public Object resolveVariable(FacesContext context, String name) throws EvaluationException {
FlowExecution execution = FlowExecutionHolderUtils.getCurrentFlowExecution(context);
if (execution != null) {
// flow execution must be present and active (note: which means variables cannot be resolved from end-state views)
if (execution != null && execution.isActive()) {
// try flash/flow/conversation
if (execution.getActiveSession().getFlashMap().contains(name)) {
return execution.getActiveSession().getFlashMap().get(name);
@@ -80,7 +81,7 @@ public class DelegatingFlowVariableResolver extends VariableResolver {
return execution.getConversationScope().get(name);
}
}
// no flow execution bound or flow execution attribute found with that name - delegate
// no active flow execution bound or flow execution attribute found with that name - delegate
return resolverDelegate.resolveVariable(context, name);
}
}