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

added launch locking consistent with flow executor impl

Browse Source
This commit is contained in:
Keith Donald
2007-04-13 16:36:50 +00:00
parent bdceb766a5
commit b5161bd444
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolder.java
View File

@@ -84,8 +84,8 @@ public class FlowExecutionHolder implements Serializable {
/**
* Sets the continuation key.
*/
public void setFlowExecutionKey(FlowExecutionKey continuationKey) {
this.flowExecutionKey = continuationKey;
public void setFlowExecutionKey(FlowExecutionKey key) {
this.flowExecutionKey = key;
}
/**
@@ -102,6 +102,14 @@ public class FlowExecutionHolder implements Serializable {
return flowExecutionLock;
}
/**
* Sets the lock acquired on the flow execution
* @param lock the flow execution lock
*/
public void setFlowExecutionLock(FlowExecutionLock lock) {
this.flowExecutionLock = lock;
}
/**
* Returns the view selected from the current flow execution request.
*/

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

@@ -245,6 +245,7 @@ public class FlowPhaseListener implements PhaseListener {
}
finally {
if (holder.getFlowExecutionLock() != null) {
// unlock the flow execution
holder.getFlowExecutionLock().unlock();
}
}
@@ -437,8 +438,7 @@ public class FlowPhaseListener implements PhaseListener {
FlowExecutionKeyStateHolder.COMPONENT_ID);
if (keyHolder == null) {
keyHolder = new FlowExecutionKeyStateHolder();
// expose as the first component in the view root for preservation
// in the tree
// expose as the first component in the view root for preservation in the tree
facesContext.getViewRoot().getChildren().add(0, keyHolder);
}
keyHolder.setFlowExecutionKey(flowExecutionKey);
@@ -447,17 +447,19 @@ public class FlowPhaseListener implements PhaseListener {
private void generateKey(JsfExternalContext context, FlowExecutionHolder holder) {
FlowExecution flowExecution = holder.getFlowExecution();
if (flowExecution.isActive()) {
// generate new continuation key for the flow execution before
// rendering the response
// generate new continuation key for the flow execution before rendering the response
FlowExecutionKey flowExecutionKey = holder.getFlowExecutionKey();
FlowExecutionRepository repository = getRepository(context);
if (flowExecutionKey == null) {
// it is an new conversation, generate a brand new key
// it is a new conversation - generate a brand new key
flowExecutionKey = repository.generateKey(flowExecution);
FlowExecutionLock lock = repository.getLock(flowExecutionKey);
lock.lock();
// set that the flow execution lock has been acquired
holder.setFlowExecutionLock(lock);
}
else {
// it is an existing conversaiton, use same conversation id,
// generate a new continuation id
// it is an existing conversation - get the next key
flowExecutionKey = repository.getNextKey(flowExecution, flowExecutionKey);
}
holder.setFlowExecutionKey(flowExecutionKey);