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/07/25 10:03:22 UTC
svn commit: r1150572 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java
Author: gpetracek
Date: Mon Jul 25 08:03:21 2011
New Revision: 1150572
URL: http://svn.apache.org/viewvc?rev=1150572&view=rev
Log:
EXTCDI-210 invalid page requests should be ignored
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java
Modified: myfaces/extensions/cdi/trunk/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/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java?rev=1150572&r1=1150571&r2=1150572&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java Mon Jul 25 08:03:21 2011
@@ -48,7 +48,7 @@ class ViewAccessConversationExpirationEv
//see EXTCDI-49
void observeRenderedView(String viewId)
{
- if(!viewId.equals(this.lastViewId))
+ if(viewId != null /*in case of an invalid view*/ && !viewId.equals(this.lastViewId))
{
if(this.conversation != null)
{
@@ -81,7 +81,14 @@ class ViewAccessConversationExpirationEv
{
this.lastViewId = getNewViewId();
}
- boolean result = !getCurrentViewId().equals(this.lastViewId);
+
+ String currentViewId = getCurrentViewId();
+
+ if(currentViewId == null) //in case of an invalid view
+ {
+ return false;
+ }
+ boolean result = !currentViewId.equals(this.lastViewId);
return result;
}