commit fe6305e12befd161bd752b378a84210aa18e84e7
author Bernd Bohmann <bommel@apache.org> Wed Jul 12 07:47:27 2017 +0000
committer Bernd Bohmann <bommel@apache.org> Wed Jul 12 07:47:27 2017 +0000
tree 640fd00de9c1916110fd6bd44c6484d0031c36ca
parent 961e9e6327a9a992a8233195b46566b5050f4ac9

TRINIDAD-2558
NPE with partialStateSaving off and viewCache off and myface core in restore View

trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
index 3b0d265..43874ab 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
@@ -837,8 +837,13 @@
         ((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;
       }