Updated Branches: refs/heads/master 69530253d -> fb45a781c
WICKET-5426 reset stateless flag on render, since stateful components might be added *and* removed Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fb45a781 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fb45a781 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fb45a781 Branch: refs/heads/master Commit: fb45a781c24f17d7a44658061c4f17e95c4cd1ef Parents: 6953025 Author: svenmeier <[email protected]> Authored: Thu Dec 19 15:11:13 2013 +0100 Committer: svenmeier <[email protected]> Committed: Thu Dec 19 15:11:13 2013 +0100 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/Page.java | 9 ++++----- ...WicketTesterLazyIsPageStatelessRedirectToBufferTest.java | 2 -- ...WicketTesterLazyIsPageStatelessRedirectToRenderTest.java | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/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 2be236d..1a3e9aa 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -801,11 +801,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, // Make sure it is really empty renderedComponents = null; - // if the page is stateless, reset the flag so that it is tested again - if (Boolean.TRUE.equals(stateless)) - { - stateless = null; - } + // rendering might remove or add stateful components, so clear flag to force reevaluation + stateless = null; super.onBeforeRender(); @@ -1020,6 +1017,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, { ++renderCount; render(); + + // stateless = null; } finally { http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java index f46b7f1..03d3f33 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java @@ -19,12 +19,10 @@ package org.apache.wicket.util.tester; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.settings.RequestCycleSettings; -import org.junit.Ignore; /** * https://issues.apache.org/jira/browse/WICKET-5426 */ -@Ignore public class WicketTesterLazyIsPageStatelessRedirectToBufferTest extends WicketTesterLazyIsPageStatelessBase { @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/fb45a781/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java index 90d367f..0f228e5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToRenderTest.java @@ -19,12 +19,10 @@ package org.apache.wicket.util.tester; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.settings.RequestCycleSettings; -import org.junit.Ignore; /** * https://issues.apache.org/jira/browse/WICKET-5426 */ -@Ignore public class WicketTesterLazyIsPageStatelessRedirectToRenderTest extends WicketTesterLazyIsPageStatelessBase { @Override
