Author: shane.bryzak(a)jboss.com Date: 2012-04-28 19:12:57 -0400 (Sat, 28 Apr 2012) New Revision: 14638 Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java Log: JBSEAM-4930 Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2012-04-26 12:40:59 UTC (rev 14637) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2012-04-28 23:12:57 UTC (rev 14638) @@ -92,7 +92,10 @@ public UIViewRoot restoreView(FacesContext ctx, String viewId) { UIViewRoot viewRoot =viewHandler.restoreView(ctx, viewId); - viewRoot.setViewId(viewHandler.deriveViewId(ctx,viewId)); + if (viewRoot != null) + { + viewRoot.setViewId(viewHandler.deriveViewId(ctx,viewId)); + } return viewRoot; }