[WICKET-6355] code modified according to @martin-g comments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3de67f3e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3de67f3e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3de67f3e Branch: refs/heads/master Commit: 3de67f3e7323b02c9d505b88ba10aa7a72fe65dc Parents: 71d5be3 Author: Maxim Solodovnik <[email protected]> Authored: Wed Apr 12 16:22:54 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Apr 12 16:22:54 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/wicket/resource/FileSystemResource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3de67f3e/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java index 77268ad..1ac46c3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/FileSystemResource.java @@ -68,7 +68,7 @@ public class FileSystemResource extends AbstractResource @Override protected ResourceResponse newResourceResponse(Attributes attributes) { - return createResourceResponse(path, null); + return createResourceResponse(attributes, path); } /** @@ -80,7 +80,7 @@ public class FileSystemResource extends AbstractResource * fileName to set, path.getFileName() will be used in case null passed * @return the actual resource response x */ - protected ResourceResponse createResourceResponse(Path path, String fileName) + protected ResourceResponse createResourceResponse(Attributes attributes, Path path) { try { @@ -95,7 +95,9 @@ public class FileSystemResource extends AbstractResource resourceResponse.setContentType(getMimeType()); resourceResponse.setAcceptRange(ContentRangeType.BYTES); resourceResponse.setContentLength(size); - resourceResponse.setFileName(fileName == null ? path.getFileName().toString() : fileName); + if (path != null && path.getFileName() != null) { + resourceResponse.setFileName(path.getFileName().toString()); + } RequestCycle cycle = RequestCycle.get(); Long startbyte = cycle.getMetaData(CONTENT_RANGE_STARTBYTE); Long endbyte = cycle.getMetaData(CONTENT_RANGE_ENDBYTE);
