You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/09/17 10:44:36 UTC

git commit: WICKET-4763 Page's stateless hint is initially set to 'false'

Updated Branches:
  refs/heads/master 1bc36fd29 -> ce9b3ce8e


WICKET-4763 Page's stateless hint is initially set to 'false'


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ce9b3ce8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ce9b3ce8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ce9b3ce8

Branch: refs/heads/master
Commit: ce9b3ce8ed28a5cd277733759fdb30e824f62f22
Parents: 1bc36fd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 17 11:42:54 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 17 11:42:54 2012 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/Component.java |    2 +-
 .../src/main/java/org/apache/wicket/Page.java      |    4 +-
 .../test/java/org/apache/wicket/ComponentTest.java |   29 ++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ce9b3ce8/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index e70f934..26bd055 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -437,7 +437,7 @@ public abstract class Component
 
 	/** Component flags. See FLAG_* for possible non-exclusive flag values. */
 	private int flags = FLAG_VISIBLE | FLAG_ESCAPE_MODEL_STRINGS | FLAG_VERSIONED | FLAG_ENABLED |
-		FLAG_IS_RENDER_ALLOWED | FLAG_VISIBILITY_ALLOWED;
+		FLAG_IS_RENDER_ALLOWED | FLAG_VISIBILITY_ALLOWED | FLAG_RESERVED5 /* page's stateless hint */;
 
 	private static final short RFLAG_ENABLED_IN_HIERARCHY_VALUE = 0x1;
 	private static final short RFLAG_ENABLED_IN_HIERARCHY_SET = 0x2;

http://git-wip-us.apache.org/repos/asf/wicket/blob/ce9b3ce8/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 7ef7d2e..e8b6360 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -703,9 +703,9 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
 	 */
 	private void init()
 	{
-		if (isBookmarkable())
+		if (isBookmarkable() == false)
 		{
-			setStatelessHint(true);
+			setStatelessHint(false);
 		}
 
 		// Set versioning of page based on default

http://git-wip-us.apache.org/repos/asf/wicket/blob/ce9b3ce8/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
index f177bfd..5faf64b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
@@ -235,4 +235,31 @@ public class ComponentTest extends WicketTestCase
 		assertFalse(modelChanging.get());
 		assertFalse(modelChanged.get());
 	}
-}
+
+	@Test
+	public void pageIsInitiallyStateless()
+	{
+		FlagReserved5Component component = new FlagReserved5Component("test");
+		assertTrue(component.getFlagReserved5());
+	}
+
+	/**
+	 * Component#FLAG_RESERVED5 (Page's STATELESS_HINT) must be initially set to true
+	 */
+	private static class FlagReserved5Component extends Component
+	{
+
+		public FlagReserved5Component(final String id) {
+			super(id);
+		}
+
+		private boolean getFlagReserved5()
+		{
+			return getFlag(FLAG_RESERVED5);
+		}
+
+		@Override
+		protected void onRender() {
+		}
+	}
+}
\ No newline at end of file