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

SWF-302 polishing--renamed unlock method to more general cleanup and added cleanup of flow execution holder

Browse Source
This commit is contained in:
Keith Donald
2007-05-04 19:06:28 +00:00
parent 30621467b3
commit 8d491cba01
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
View File

@@ -28,7 +28,6 @@ import org.springframework.webflow.execution.FlowExecution;
* {@link FacesContext}'s {@link ExternalContext#getRequestMap()}.
*
* @author Keith Donald
* @author Craig McClanahan
*/
public class FlowExecutionHolderUtils {
@@ -92,13 +91,15 @@ public class FlowExecutionHolderUtils {
}
/**
* Unlocks the current flow execution in the faces context if necessary.
* Can be safely called even if no execution is bound or one is bound but not locked.
* Cleans up the current flow execution in the faces context if necessary.
* Specifically, handles unlocking the execution if necessary and setting the
* holder to null.
* @param context the faces context
*/
public static void unlockCurrentFlowExecutionIfNecessary(FacesContext context) {
public static void cleanupCurrentFlowExecution(FacesContext context) {
if (isFlowExecutionRestored(context)) {
getFlowExecutionHolder(context).unlockFlowExecutionIfNecessary();
context.getExternalContext().getRequestMap().remove(getFlowExecutionHolderKey());
}
}

2
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandler.java
View File

@@ -246,7 +246,7 @@ public class FlowNavigationHandler extends DecoratingNavigationHandler {
if (logger.isDebugEnabled()) {
logger.debug("Cleaning up allocated flow system resources");
}
FlowExecutionHolderUtils.unlockCurrentFlowExecutionIfNecessary(context);
FlowExecutionHolderUtils.cleanupCurrentFlowExecution(context);
ExternalContextHolder.setExternalContext(null);
}
}

2
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPhaseListener.java
View File

@@ -481,7 +481,7 @@ public class FlowPhaseListener implements PhaseListener {
if (logger.isDebugEnabled()) {
logger.debug("Cleaning up allocated flow system resources");
}
FlowExecutionHolderUtils.unlockCurrentFlowExecutionIfNecessary(context);
FlowExecutionHolderUtils.cleanupCurrentFlowExecution(context);
ExternalContextHolder.setExternalContext(null);
}