You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/04/09 09:20:41 UTC
git commit: DELTASPIKE-307 improved cache
Updated Branches:
refs/heads/master 27cfd16d0 -> 6f18c2049
DELTASPIKE-307 improved cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/6f18c204
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/6f18c204
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/6f18c204
Branch: refs/heads/master
Commit: 6f18c2049bc110c034c8188ff1d22270b205cded
Parents: 27cfd16
Author: gpetracek <gp...@apache.org>
Authored: Tue Apr 9 09:15:28 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Tue Apr 9 09:15:28 2013 +0200
----------------------------------------------------------------------
.../listener/phase/DeltaSpikePhaseListener.java | 1 -
.../jsf/impl/security/ViewRootAccessHandler.java | 10 ++++------
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6f18c204/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
index 917e2f4..4de5fd0 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java
@@ -90,7 +90,6 @@ public class DeltaSpikePhaseListener implements PhaseListener, Deactivatable
private void onAfterRestoreView(FacesContext facesContext)
{
- checkSecuredView(facesContext);
//TODO call init-view callbacks
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6f18c204/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/ViewRootAccessHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/ViewRootAccessHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/ViewRootAccessHandler.java
index c2d42c6..4118248 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/ViewRootAccessHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/security/ViewRootAccessHandler.java
@@ -18,7 +18,6 @@
*/
package org.apache.deltaspike.jsf.impl.security;
-import org.apache.deltaspike.core.api.config.view.ViewConfig;
import org.apache.deltaspike.core.api.config.view.metadata.ConfigDescriptor;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
import org.apache.deltaspike.core.api.provider.BeanProvider;
@@ -38,13 +37,12 @@ public class ViewRootAccessHandler
@Inject
private ViewConfigResolver viewConfigResolver;
- private String checkedViewId = ViewConfig.class.getName();
+ private List<String> checkedViewIds = new ArrayList<String>();
public void checkAccessTo(UIViewRoot uiViewRoot)
{
if (uiViewRoot == null)
{
- this.checkedViewId = null; //forces lazy check
return;
}
@@ -55,6 +53,8 @@ public class ViewRootAccessHandler
return;
}
+ this.checkedViewIds.add(viewId);
+
ConfigDescriptor configDescriptor = this.viewConfigResolver.getViewConfigDescriptor(viewId);
//topmost nodes get checked first
@@ -102,8 +102,6 @@ public class ViewRootAccessHandler
private boolean checkView(String viewId)
{
- return viewId != null &&
- (ViewConfig.class.getName().equals(this.checkedViewId) /*no view was checked in this request*/ ||
- !viewId.equals(this.checkedViewId)/*the prev. checked view was a different one*/);
+ return viewId != null && !this.checkedViewIds.contains(viewId);
}
}