<< ADD DESCRIPTION HERE http://java.net/jira/browse/JAVASERVERFACES-XXXX >> SECTION: Modified Files ---------------------------- M jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java M test/servlet30/pom.xml M + test/servlet30/stateSaving/pom.xml M + test/servlet30/stateSaving/viewExpiredException/pom.xml A + test/servlet30/stateSaving SECTION: Diffs ---------------------------- Index: . =================================================================== --- . (revision 13629) +++ . (working copy) Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/MOJARRA_2_2X_ROLLING:r13606 Index: jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java =================================================================== --- jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java (revision 13629) +++ jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java (working copy) @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -335,13 +335,13 @@ RequestStateManager.set(ctx, RequestStateManager.LOGICAL_VIEW_MAP, idInLogicalMap); + + Object[] restoredState = new Object[2]; Object[] state = (Object[]) actualMap.get(idInActualMap); - Object[] restoredState = new Object[2]; - - restoredState[0] = state[0]; - restoredState[1] = state[1]; - if(state != null){ + restoredState[0] = state[0]; + restoredState[1] = state[1]; + RequestStateManager.set(ctx, RequestStateManager.ACTUAL_VIEW_MAP, idInActualMap); Index: test/servlet30/pom.xml =================================================================== --- test/servlet30/pom.xml (revision 13629) +++ test/servlet30/pom.xml (working copy) @@ -74,5 +74,6 @@ multi-tenant navigation systest + stateSaving Index: test/servlet30/stateSaving/pom.xml =================================================================== --- test/servlet30/stateSaving/pom.xml (working copy) +++ test/servlet30/stateSaving/pom.xml (working copy) @@ -47,7 +47,7 @@ com.sun.faces.test.servlet30 pom - 2.2.9-SNAPSHOT + 2.3.0-m01-SNAPSHOT com.sun.faces.test.servlet30.statesaving pom Index: test/servlet30/stateSaving/viewExpiredException/pom.xml =================================================================== --- test/servlet30/stateSaving/viewExpiredException/pom.xml (working copy) +++ test/servlet30/stateSaving/viewExpiredException/pom.xml (working copy) @@ -45,11 +45,11 @@ com.sun.faces.test.servlet30.statesaving pom - 2.2.9-SNAPSHOT + 2.3.0-m01-SNAPSHOT com.sun.faces.test.servlet30.statesaving viewexpiredexception - 2.2.9-SNAPSHOT + 2.3.0-m01-SNAPSHOT war Mojarra ${project.version} - Test - Servlet 3.0 - State Saving - ViewExpireException SECTION: New Files ---------------------------- SEE ATTACHMENTS