Author: nbelaevski Date: 2008-10-14 12:41:02 -0400 (Tue, 14 Oct 2008) New Revision: 10751 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java Log: https://jira.jboss.org/jira/browse/RF-4551 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-10-14 15:17:13 UTC (rev 10750) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-10-14 16:41:02 UTC (rev 10751) @@ -39,6 +39,7 @@ import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.webapp.BaseFilter; +import org.ajax4jsf.webapp.FilterServletResponseWrapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.richfaces.event.RenderPhaseComponentListener; @@ -200,19 +201,25 @@ } Map<String,Object> requestMap = context.getExternalContext().getRequestMap(); - if (null != requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE)) { - if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) { - ViewResources viewResources = new ViewResources(); - - viewResources.initialize(context); - viewResources.processHeadResources(context); - - requestMap.put(AjaxContext.HEAD_EVENTS_PARAMETER, viewResources.getHeadEvents()); - - // Mark as processed. - requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE); + FilterServletResponseWrapper filterServletResponseWrapper = (FilterServletResponseWrapper) + requestMap.get(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE); + if (null != filterServletResponseWrapper) { + if (!filterServletResponseWrapper.isError()) { + if (!Boolean.TRUE.equals(requestMap.get(RESOURCES_PROCESSED))) { + + ViewResources viewResources = new ViewResources(); + + viewResources.initialize(context); + viewResources.processHeadResources(context); + + requestMap.put(AjaxContext.HEAD_EVENTS_PARAMETER, viewResources.getHeadEvents()); + + // Mark as processed. + requestMap.put(RESOURCES_PROCESSED, Boolean.TRUE); + } } + // Save viewId for a parser selection requestMap.put(AjaxViewHandler.VIEW_ID_KEY, context.getViewRoot().getViewId()); }