You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2012/05/21 15:53:39 UTC
[1/2] git commit: Revert "WICKET-4566 Resource filtering breaks the
calculation of rendered resources"
Updated Branches:
refs/heads/master ab83f83e6 -> fc23eebdf
Revert "WICKET-4566 Resource filtering breaks the calculation of rendered resources"
This reverts commit ab83f83e6cccc604e26ef9373af86d3e92bd0eae.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fc23eebd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fc23eebd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fc23eebd
Branch: refs/heads/master
Commit: fc23eebdfe619e34d5b689c32410185e218eaad0
Parents: 7b3a642
Author: Emond Papegaaij <pa...@apache.org>
Authored: Mon May 21 15:47:23 2012 +0200
Committer: Emond Papegaaij <pa...@apache.org>
Committed: Mon May 21 15:47:23 2012 +0200
----------------------------------------------------------------------
.../markup/head/internal/HeaderResponse.java | 26 +--------------
1 files changed, 1 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fc23eebd/wicket-core/src/main/java/org/apache/wicket/markup/head/internal/HeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/internal/HeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/internal/HeaderResponse.java
index aee2f8b..d0dc8aa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/internal/HeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/internal/HeaderResponse.java
@@ -19,11 +19,9 @@ package org.apache.wicket.markup.head.internal;
import java.util.HashSet;
import java.util.Set;
-import org.apache.wicket.MetaDataKey;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.Response;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.NullResponse;
@@ -35,12 +33,7 @@ import org.apache.wicket.response.NullResponse;
*/
public abstract class HeaderResponse implements IHeaderResponse
{
- /**
- * A key used to keep the set of rendered resources in the request cycle's meta data
- */
- private static final MetaDataKey<Set<Object>> RENDERED_RESOURCES = new MetaDataKey<Set<Object>>()
- {
- };
+ private final Set<Object> rendered = new HashSet<Object>();
private boolean closed;
@@ -50,7 +43,6 @@ public abstract class HeaderResponse implements IHeaderResponse
@Override
public void markRendered(Object object)
{
- Set<Object> rendered = getRenderedResources();
rendered.add(object);
}
@@ -88,7 +80,6 @@ public abstract class HeaderResponse implements IHeaderResponse
@Override
public boolean wasRendered(Object object)
{
- Set<Object> rendered = getRenderedResources();
return rendered.contains(object);
}
@@ -127,19 +118,4 @@ public abstract class HeaderResponse implements IHeaderResponse
* @return Response
*/
protected abstract Response getRealResponse();
-
- /**
- * @return the set of rendered resources per request cycle
- */
- private Set<Object> getRenderedResources()
- {
- RequestCycle requestCycle = RequestCycle.get();
- Set<Object> rendered = requestCycle.getMetaData(RENDERED_RESOURCES);
- if (rendered == null)
- {
- rendered = new HashSet<Object>();
- requestCycle.setMetaData(RENDERED_RESOURCES, rendered);
- }
- return rendered;
- }
}