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 2013/08/06 15:55:36 UTC
git commit: WICKET-5304 AbstractResource should check for error code
first before for modifications
Updated Branches:
refs/heads/wicket-6.x 9a1c52217 -> 150a8c884
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/150a8c88
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/150a8c88
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/150a8c88
Branch: refs/heads/wicket-6.x
Commit: 150a8c8847483014e7b3e8cfc0c68e813a4643cc
Parents: 9a1c522
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Aug 6 15:54:52 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Aug 6 15:55:23 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/150a8c88/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..6f5439e 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());
@@ -609,6 +603,12 @@ public abstract class AbstractResource implements IResource
return;
}
+ if (!data.dataNeedsToBeWritten(attributes))
+ {
+ webResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+ return;
+ }
+
String fileName = data.getFileName();
ContentDisposition disposition = data.getContentDisposition();
String mimeType = data.getContentType();
@@ -707,4 +707,4 @@ public abstract class AbstractResource implements IResource
Streams.copy(stream, response.getOutputStream());
}
}
-}
\ No newline at end of file
+}