From 1ae4db62403b4a7f6836ab1378e7ceea58a566b2 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 17 Jun 2016 06:41:54 -0400 Subject: [PATCH] Fix issue with JSF 2.0 compatibility Issue: SWF-1684 --- .../faces/webflow/JsfViewFactory.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java index 0f306833..aaa25e42 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java @@ -188,28 +188,28 @@ public class JsfViewFactory implements ViewFactory { } private void publishPostRestoreStateEvent(FacesContext facesContext) { - EnumSet visitHints = null; + VisitHint visitHint = null; try { - visitHints = EnumSet.of(VisitHint.SKIP_ITERATION); + visitHint = Enum.valueOf(VisitHint.class, "SKIP_ITERATION"); } catch (IllegalArgumentException ex) { // JSF < 2.1 } - String attributeName = "javax.faces.visit.SKIP_ITERATION"; - facesContext.getAttributes().put(attributeName, true); + String name = "javax.faces.visit.SKIP_ITERATION"; + facesContext.getAttributes().put(name, true); try { - VisitContext visitContext = (visitHints != null ? - VisitContext.createVisitContext(facesContext, null, visitHints) : + VisitContext visitContext = (visitHint != null ? + VisitContext.createVisitContext(facesContext, null, EnumSet.of(visitHint)) : VisitContext.createVisitContext(facesContext)); facesContext.getViewRoot().visitTree(visitContext, new PostRestoreStateEventVisitCallback()); } catch (AbortProcessingException e) { PhaseId phaseId = facesContext.getCurrentPhaseId(); - ExceptionQueuedEventContext eventContext = new ExceptionQueuedEventContext(facesContext, e, null, phaseId); + Object eventContext = new ExceptionQueuedEventContext(facesContext, e, null, phaseId); facesContext.getApplication().publishEvent(facesContext, ExceptionQueuedEvent.class, eventContext); } finally { - facesContext.getAttributes().remove(attributeName); + facesContext.getAttributes().remove(name); } }