You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/12/18 18:37:43 UTC

svn commit: r1050681 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

Author: mgrigorov
Date: Sat Dec 18 17:37:43 2010
New Revision: 1050681

URL: http://svn.apache.org/viewvc?rev=1050681&view=rev
Log:
WICKET-3267 Error page mappings in web.xml not working in 1.5

Do not flush the response if there is nothing written into it.
Otherwise we use response.setStatus(404) in WicketServlet#fallback() and the web container doesn't fire new request for the 404 error code.
Tested with jetty6 and tomcat7

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1050681&r1=1050680&r2=1050681&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Sat Dec 18 17:37:43 2010
@@ -173,7 +173,10 @@ public class WicketFilter implements Fil
 				Thread.currentThread().setContextClassLoader(previousClassLoader);
 			}
 
-			response.flushBuffer();
+			if (response.isCommitted())
+			{
+				response.flushBuffer();
+			}
 		}
 		return res;
 	}