use wicket's url decoder instead of the java.lang version
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/85797065 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/85797065 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/85797065 Branch: refs/heads/master Commit: 85797065096f7d8e6f1a66e1dd574cef5143a731 Parents: 6457173 Author: Peter Ertl <[email protected]> Authored: Tue May 8 00:54:52 2012 +0200 Committer: Peter Ertl <[email protected]> Committed: Tue May 8 00:54:52 2012 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/file/Files.java | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/85797065/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java index f9d2579..c40e3ca 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URL; -import java.net.URLDecoder; +import org.apache.wicket.util.encoding.UrlDecoder; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.io.Streams; import org.apache.wicket.util.lang.Args; @@ -366,15 +366,7 @@ public class Files public static File getLocalFileFromUrl(URL url) { final URL location = Args.notNull(url, "url"); - - try - { - return getLocalFileFromUrl(URLDecoder.decode(location.toExternalForm(), "UTF-8")); - } - catch (UnsupportedEncodingException ex) - { - return null; - } + return getLocalFileFromUrl(UrlDecoder.PATH_INSTANCE.decode(location.toExternalForm(), "UTF-8")); } /**
