Skip to content

Fix html:cancel regression from commit ""STR-286 and STR-1116: Action… #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nrmnrm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix html:cancel regression from commit ""STR-286 and STR-1116: Action… #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ protected boolean execute_(ActionContext actionCtx)
ActionConfig actionConfig = actionCtx.getActionConfig();
ActionForm actionForm = actionCtx.getActionForm();

// First determine if the request was cancelled
handleCancel(actionCtx, actionConfig, actionForm);

// Is there a form bean for this request?
if (actionForm == null) {
return (false);
Expand All @@ -79,6 +76,9 @@ protected boolean execute_(ActionContext actionCtx)
populate(actionCtx, actionConfig, actionForm);
}

// Always handle cancel last, as it needs populate first
handleCancel(actionCtx, actionConfig, actionForm);

return CONTINUE_PROCESSING;
}

Expand Down Expand Up @@ -198,4 +198,4 @@ protected void handleCancel(ActionContext context,
context.setCancelled(Boolean.FALSE);
}
}
}
}