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 2013/11/24 12:49:20 UTC
git commit: WICKET-5422 ComponentRenderer.renderComponent() adds a
page to DataStore
Updated Branches:
refs/heads/master cb5da57c8 -> 166dc9028
WICKET-5422 ComponentRenderer.renderComponent() adds a page to DataStore
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/166dc902
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/166dc902
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/166dc902
Branch: refs/heads/master
Commit: 166dc90280fa506699cbca2a0e1f70cce13c9022
Parents: cb5da57
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 24 12:48:57 2013 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 24 12:48:57 2013 +0100
----------------------------------------------------------------------
.../wicket/core/util/string/ComponentRenderer.java | 11 ++++++++++-
.../protocol/ws/api/AbstractWebSocketProcessor.java | 5 +++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/166dc902/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
index 9a35876..a5582d2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/ComponentRenderer.java
@@ -134,6 +134,9 @@ public class ComponentRenderer
private RenderPage(Component component)
{
+ // do not store the page in IPageStore/IDataStore. WICKET-5422
+ setStatelessHint(true);
+
String componentMarkup;
try
{
@@ -149,7 +152,6 @@ public class ComponentRenderer
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
{
-
return new StringResourceStream(markup);
}
@@ -159,6 +161,13 @@ public class ComponentRenderer
// no caching for this page
return null;
}
+
+ @Override
+ public boolean isBookmarkable()
+ {
+ // pretend the page is bookmarkable to make it stateless. WICKET-5422
+ return true;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/166dc902/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
index 3359f70..a72e36d 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
@@ -402,6 +402,11 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
*/
private static class WebSocketResourcePage extends WebPage implements IMarkupResourceStreamProvider
{
+ private WebSocketResourcePage()
+ {
+ setStatelessHint(true);
+ }
+
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
{