You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/11 11:55:30 UTC

svn commit: r1080516 - /myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java

Author: gpetracek
Date: Fri Mar 11 10:55:30 2011
New Revision: 1080516

URL: http://svn.apache.org/viewvc?rev=1080516&view=rev
Log:
complete switch to a new view-access-scope approach

Modified:
    myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java

Modified: myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java?rev=1080516&r1=1080515&r2=1080516&view=diff
==============================================================================
--- myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/branches/sandbox_refactorings/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java Fri Mar 11 10:55:30 2011
@@ -59,25 +59,8 @@ class ViewAccessConversationExpirationEv
 
     public boolean isExpired()
     {
-        //see EXTCDI-154
-        if(this.accessDecisionVoterContext != null &&
-                AccessDecisionState.VOTE_IN_PROGRESS.equals(this.accessDecisionVoterContext.getState()))
-        {
-            return false;
-        }
-
-        if(this.lastViewId == null)
-        {
-            return true;
-        }
-
-        String oldViewId = getOldViewId();
-
-        if (oldViewId != null && oldViewId.equals(this.lastViewId))
-        {
-            this.lastViewId = getNewViewId();
-        }
-        return !getCurrentViewId().equals(this.lastViewId);
+        //handled via #observeRenderedView
+        return false;
     }
 
     public void touch()