Author: lincolnthree Date: 2010-07-27 15:11:53 -0400 (Tue, 27 Jul 2010) New Revision: 13519 Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java Log: Preventing potential NPE Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java 2010-07-27 17:08:55 UTC (rev 13518) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/FlashScopedContext.java 2010-07-27 19:11:53 UTC (rev 13519) @@ -143,7 +143,7 @@ { if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) { - getSessionMap().remove(getSessionKey(currentContext.getId())); + getSessionMap().remove(getSessionKey(getFlashContext().getId())); Map<Contextual<?>, Object> componentInstanceMap = getComponentInstanceMap(); Map<Contextual<?>, CreationalContext<?>> creationalContextMap = getCreationalContextMap();