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 2014/06/16 13:00:16 UTC
git commit: WICKET-5602 DynamicImageResource should set the mime type
after reading the image data
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x c70a5e009 -> d0fd21029
WICKET-5602 DynamicImageResource should set the mime type after reading the image data
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d0fd2102
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d0fd2102
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d0fd2102
Branch: refs/heads/wicket-6.x
Commit: d0fd2102967f34e35be1d009085c314898b8fb0a
Parents: c70a5e0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 16 13:59:21 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 16 13:59:21 2014 +0300
----------------------------------------------------------------------
.../org/apache/wicket/request/resource/DynamicImageResource.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d0fd2102/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
index 9e023d0..26ab5a0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
@@ -148,8 +148,6 @@ public abstract class DynamicImageResource extends AbstractResource
if (response.dataNeedsToBeWritten(attributes))
{
- response.setContentType("image/" + getFormat());
-
response.setContentDisposition(ContentDisposition.INLINE);
final byte[] imageData = getImageData(attributes);
@@ -159,6 +157,7 @@ public abstract class DynamicImageResource extends AbstractResource
}
else
{
+ response.setContentType("image/" + getFormat());
response.setWriteCallback(new WriteCallback()
{
@Override