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/01 09:11:12 UTC
git commit: WICKET-5295 UrlResourceStream#getData content-type
detection relies on flawed logic in URLConnection#getContentType
Updated Branches:
refs/heads/master fb478e926 -> 02d3cda2f
WICKET-5295 UrlResourceStream#getData content-type detection relies on flawed logic in URLConnection#getContentType
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/02d3cda2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/02d3cda2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/02d3cda2
Branch: refs/heads/master
Commit: 02d3cda2f37bd10cec0a6991d928643a559eb6c2
Parents: fb478e9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 1 09:10:15 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:10:15 2013 +0200
----------------------------------------------------------------------
.../core/util/resource/UrlResourceStream.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/02d3cda2/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
index 98aed1a..199ef6d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
@@ -119,19 +119,20 @@ public class UrlResourceStream extends AbstractResourceStream
{
streamData.connection = url.openConnection();
streamData.contentLength = streamData.connection.getContentLength();
- streamData.contentType = streamData.connection.getContentType();
+
+ if (Application.exists())
+ {
+ streamData.contentType = Application.get().getMimeType(url.getFile());
+ }
+ else
+ {
+ streamData.contentType = streamData.connection.getContentType();
+ }
if (streamData.contentType == null || streamData.contentType.contains("unknown"))
{
- if (Application.exists())
- {
- streamData.contentType = Application.get().getMimeType(url.getFile());
- }
- else
- {
- streamData.contentType = URLConnection.getFileNameMap().getContentTypeFor(
- url.getFile());
- }
+ streamData.contentType = URLConnection.getFileNameMap().getContentTypeFor(
+ url.getFile());
}
}
catch (IOException ex)