diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-01-25 15:45:08 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-01-25 15:45:08 +0000 |
| commit | d5afb8f7999bbe5166d3d3dd978fbba41fd5f012 (patch) | |
| tree | 12eacdb37e3d2c65d6e5a746a76788239820bbaa /src/com/vaadin/service | |
| parent | d1a635a81be3a6de05b923e6c36e76beb28664e4 (diff) | |
| download | vaadin-framework-d5afb8f7999bbe5166d3d3dd978fbba41fd5f012.tar.gz vaadin-framework-d5afb8f7999bbe5166d3d3dd978fbba41fd5f012.zip | |
Merged [10797]-[10991] from 6.2
svn changeset:10996/svn branch:6.3
Diffstat (limited to 'src/com/vaadin/service')
| -rw-r--r-- | src/com/vaadin/service/FileTypeResolver.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/vaadin/service/FileTypeResolver.java b/src/com/vaadin/service/FileTypeResolver.java index 599cce924f..566f299376 100644 --- a/src/com/vaadin/service/FileTypeResolver.java +++ b/src/com/vaadin/service/FileTypeResolver.java @@ -245,7 +245,13 @@ public class FileTypeResolver implements Serializable { dotIndex++; if (fileName.length() > dotIndex) { - final String ext = fileName.substring(dotIndex); + String ext = fileName.substring(dotIndex); + + // Ignore any query parameters + int queryStringStart = ext.indexOf('?'); + if (queryStringStart > 0) { + ext = ext.substring(0, queryStringStart); + } // Return type from extension map, if found final String type = (String) extToMIMEMap.get(ext); |