[richfaces-svn-commits] JBoss Rich Faces SVN: r13416 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-04-07 13:50:57 -0400 (Tue, 07 Apr 2009)
New Revision: 13416

Modified:
   trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
https://jira.jboss.org/jira/browse/RF-6607

Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java	2009-04-07 17:12:09 UTC (rev 13415)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java	2009-04-07 17:50:57 UTC (rev 13416)
@@ -178,8 +178,8 @@
 			chain.doFilter(request, servletResponseWrapper);
 
 		} catch (ServletException e) {
-			log.error("Exception in the filter chain", e);
-			if(handleViewExpiredOnClient && isViewExpired(e) && isAjaxRequest(request)){
+			if(handleViewExpiredOnClient && (isViewExpired(e) || isViewExpired(e.getRootCause())) && isAjaxRequest(request)){
+				log.debug("ViewExpiredException in the filter chain - will be handled on the client", e);
 				Writer output = resetResponse(response, servletResponseWrapper, "true");
 				String message = Messages
 				.getMessage(Messages.AJAX_VIEW_EXPIRED);
@@ -196,7 +196,8 @@
 				response.flushBuffer();
 				return;
 			} else {
-			throw e;
+				log.error("Exception in the filter chain", e);
+				throw e;
 			}
 		} finally {
 			request.removeAttribute(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE);