[rfc][icedtea-web] another decoding/encoding file/url fix

[Jiri Vanek]

On 10/21/2014 03:44 PM, Jie Kang wrote:
>
>
> ----- Original Message -----
>>
>>
>> ----- Original Message -----
>>> This is very simple fix for
>>> https://bugzilla.redhat.com/show_bug.cgi?id=1154177 and it seems that
>>> encoding are flowing here and back without any order:(
>>
>> Hello,
>>
>> Patch looks fine :) +1
>
>
> Actually, may also want to check for
>
> url.getPath()
>
> as well.
>
>
> According to javadoc [1], url.getFile() = url.getPath() + url.getQuery()
>
> [1] http://docs.oracle.com/javase/7/docs/api/java/net/URL.html#getFile()

TBH, I dont know if I wont query or not. As this used in case of file protocol, then it should be ok for both.
Maybe both should be tried? Anyway your path give me more sense now.
>
>
>
>>
>>
>> Regards,
>>
>>>
>>> J.
>>>
>>
>> --
>>
>> Jie Kang
>>
>

-------------- next part --------------
diff -r 016df62ed7a3 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Mon Oct 20 17:44:45 2014 +0200
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Tue Oct 21 15:53:10 2014 +0200
@@ -396,8 +396,16 @@
 
             if (location.getProtocol().equalsIgnoreCase("file")) {
                 File file = UrlUtils.decodeUrlAsFile(location);
-                if (file.exists())
+                if (file.exists()) {
                     return file;
+                }
+                // try plain, not decoded file now
+                // sometimes the jnlp app developers are encoding for us
+                // so we end up encoding already encoded file. See RH1154177
+                file = new File(location.getPath());
+                 if (file.exists()) {
+                    return file;
+                }
             }
 
             return null;