Updated Branches: refs/heads/master 0e119b2db -> 7dca2f7ce
WICKET-4340: move render allowed check to onConfigure, onBeforeRender is not called Fix indenting - use tabs. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7dca2f7c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7dca2f7c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7dca2f7c Branch: refs/heads/master Commit: 7dca2f7ce4309cd5bb367ff5dbeacddd1cb06698 Parents: 0e119b2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jan 17 10:28:16 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jan 17 10:28:16 2012 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Page.java | 22 +++++++------- 1 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7dca2f7c/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 34399c0..24845dd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -771,9 +771,9 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, } @Override - protected void onConfigure() + protected void onConfigure() { - super.onConfigure(); + super.onConfigure(); // first try to check if the page can be rendered: if (!isActionAuthorized(RENDER)) @@ -784,15 +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() - { + } + + /** + * + * @see org.apache.wicket.Component#onBeforeRender() + */ + @Override + protected void onBeforeRender() + { // Make sure it is really empty renderedComponents = null;
