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

SWF-1000 - JsfViewFactory not correctly checking if viewAlreadySet

Browse Source
This commit is contained in:
Jeremy Grelle
2009-01-14 22:31:17 +00:00
parent 1d979b7b2d
commit 13b05e984b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
View File

@@ -80,7 +80,7 @@ public class JsfViewFactory implements ViewFactory {
}
JsfView view;
String viewName = (String) viewIdExpression.getValue(context);
if (viewAlreadySet(facesContext)) {
if (viewAlreadySet(facesContext, viewName)) {
if (logger.isDebugEnabled()) {
logger.debug("Existing view root found with id '" + facesContext.getViewRoot().getId() + "'");
}
@@ -129,8 +129,8 @@ public class JsfViewFactory implements ViewFactory {
}
}
private boolean viewAlreadySet(FacesContext facesContext) {
if (facesContext.getViewRoot() != null) {
private boolean viewAlreadySet(FacesContext facesContext, String viewName) {
if (facesContext.getViewRoot() != null && facesContext.getViewRoot().getViewId().equals(viewName)) {
// the corner case where a before RESTORE_VIEW PhaseListener has handled setting the UIViewRoot
return true;
} else {