You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2011/01/24 09:53:49 UTC
svn commit: r1062684 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Author: matzew
Date: Mon Jan 24 08:53:49 2011
New Revision: 1062684
URL: http://svn.apache.org/viewvc?rev=1062684&view=rev
Log:
TRINIDAD-2017 - Trinidad statemananger needs to store everything on the client, when HTML_Basic is used, in combination with standard client-side state-saving
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=1062684&r1=1062683&r2=1062684&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Mon Jan 24 08:53:49 2011
@@ -960,7 +960,9 @@ public class StateManagerImpl extends St
// is vanilla JSF used? No Trinidad render-kit-id give? If so, we need to return FALSE,
// since we want to save the ENTIRE state on the client...
- if (RenderKitFactory.HTML_BASIC_RENDER_KIT.equals(FacesContext.getCurrentInstance().getViewRoot().getRenderKitId()))
+ UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
+
+ if (viewRoot != null && RenderKitFactory.HTML_BASIC_RENDER_KIT.equals(viewRoot.getRenderKitId()))
{
return false;
}