WICKET-4340: move render allowed check to onConfigure, onBeforeRender is not called
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/565ea73e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/565ea73e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/565ea73e Branch: refs/heads/master Commit: 565ea73efd0634fb4cc24e0a22396a6a2d907293 Parents: 85fc486 Author: Emond Papegaaij <[email protected]> Authored: Tue Jan 17 10:07:16 2012 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Tue Jan 17 10:07:16 2012 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Page.java | 18 ++++++++++----- 1 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/565ea73e/wicket-core/src/main/java/org/apache/wicket/Page.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java index 57d2b45..34399c0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -770,13 +770,11 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, }); } - /** - * - * @see org.apache.wicket.Component#onBeforeRender() - */ @Override - protected void onBeforeRender() + protected void onConfigure() { + super.onConfigure(); + // first try to check if the page can be rendered: if (!isActionAuthorized(RENDER)) { @@ -786,7 +784,15 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, } throw new UnauthorizedActionException(this, Component.RENDER); } - + } + + /** + * + * @see org.apache.wicket.Component#onBeforeRender() + */ + @Override + protected void onBeforeRender() + { // Make sure it is really empty renderedComponents = null;
