WICKET-5304 AbstractResource should check for error code first before for modifications
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f0cfce83 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f0cfce83 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f0cfce83 Branch: refs/heads/5299-ajax-strategy Commit: f0cfce83e3b22073b1a56352f6998892c99832d9 Parents: 67d8bc8 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Tue Aug 6 15:54:52 2013 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Tue Aug 6 15:55:37 2013 +0200 ---------------------------------------------------------------------- .../wicket/request/resource/AbstractResource.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f0cfce83/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java index ecfc444..a1b8086 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java @@ -591,12 +591,6 @@ public abstract class AbstractResource implements IResource // 2. Caching configureCache(data, attributes); - if (!data.dataNeedsToBeWritten(attributes)) - { - webResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED); - return; - } - if (data.getErrorCode() != null) { webResponse.sendError(data.getErrorCode(), data.getErrorMessage()); @@ -608,6 +602,12 @@ public abstract class AbstractResource implements IResource webResponse.setStatus(data.getStatusCode()); return; } + + if (!data.dataNeedsToBeWritten(attributes)) + { + webResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + return; + } String fileName = data.getFileName(); ContentDisposition disposition = data.getContentDisposition(); @@ -707,4 +707,4 @@ public abstract class AbstractResource implements IResource Streams.copy(stream, response.getOutputStream()); } } -} \ No newline at end of file +}
