Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up the tabs

Browse Source 
WW-2572


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@649813 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2008-04-19 13:46:35 +00:00
parent 848b6f03ff
commit 0c162a4efb
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
+28 -28
View File
@@ -59,36 +59,36 @@ public class StrutsNavigationHandler extends NavigationHandler {
public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) {
ActionContext ctx = ActionContext.getContext();
if (outcome != null) {
if (ctx == null && ctx.getActionInvocation() == null) {
delegateToParentNavigation(facesContext, fromAction, outcome);
} else {
ActionConfig config = ctx.getActionInvocation().getProxy().getConfig();
Map results = config.getResults();
ResultConfig resultConfig = null;
synchronized (config) {
try {
resultConfig = (ResultConfig) results.get(outcome);
} catch (NullPointerException e) {
}
if (resultConfig == null) {
// If no result is found for the given resultCode, try to get a wildcard '*' match.
resultConfig = (ResultConfig) results.get("*");
}
}
if (resultConfig != null) {
ctx.getActionInvocation().setResultCode(outcome);
} else {
delegateToParentNavigation(facesContext, fromAction, outcome);
}
}
if (ctx == null && ctx.getActionInvocation() == null) {
delegateToParentNavigation(facesContext, fromAction, outcome);
} else {
ActionConfig config = ctx.getActionInvocation().getProxy().getConfig();
Map results = config.getResults();
ResultConfig resultConfig = null;
synchronized (config) {
try {
resultConfig = (ResultConfig) results.get(outcome);
} catch (NullPointerException e) {
}
if (resultConfig == null) {
// If no result is found for the given resultCode, try to get a wildcard '*' match.
resultConfig = (ResultConfig) results.get("*");
}
}
if (resultConfig != null) {
ctx.getActionInvocation().setResultCode(outcome);
} else {
delegateToParentNavigation(facesContext, fromAction, outcome);
}
}
}
}
private void delegateToParentNavigation(FacesContext facesContext, String fromAction, String outcome) {
// Failing over to parent handler
parent.handleNavigation(facesContext, fromAction, outcome);
}
private void delegateToParentNavigation(FacesContext facesContext, String fromAction, String outcome) {
// Failing over to parent handler
parent.handleNavigation(facesContext, fromAction, outcome);
}
}