You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2017/07/12 07:47:27 UTC
svn commit: r1801685 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Author: bommel
Date: Wed Jul 12 07:47:27 2017
New Revision: 1801685
URL: http://svn.apache.org/viewvc?rev=1801685&view=rev
Log:
TRINIDAD-2558
NPE with partialStateSaving off and viewCache off and myface core in restore View
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=1801685&r1=1801684&r2=1801685&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 Wed Jul 12 07:47:27 2017
@@ -837,8 +837,13 @@ public class StateManagerImpl extends St
((Structure) structure).createComponent();
if (state != null)
+ {
+ if (context.getViewRoot() == null)
+ {
+ context.setViewRoot(root);
+ }
root.processRestoreState(context, state);
-
+ }
_LOG.finer("Restored state for view \"{0}\"", viewId);
return root;
}