/hg/release/icedtea-web-1.6: 4 new changesets

[Jiri Vanek]

On 09/08/2015 12:01 PM, Stefan Ring wrote:
>> +    private static String stripFileImp(URL documentbase) {
>> +        try {
>> +            String normlaized = UrlUtils.normalizeUrlAndStripParams(documentbase).toExternalForm().trim();
>> +            if (normlaized.endsWith("/") || normlaized.endsWith("\\")) {
>> +                return normlaized;
>> +            }
>> +            URL middleway = new URL(normlaized);
>> +            String file = middleway.getFile();
>> +            int i = Math.max(file.lastIndexOf('/'), file.lastIndexOf('\\'));
>> +            if (i<0){
>> +                return normlaized;
>> +            }
>> +            String parent = file.substring(0, i+1);
>> +            String stripped = normlaized.replace(file, parent);
>> +            return stripped;
>> +        } catch (Exception ex) {
>> +            OutputController.getLogger().log(ex);
>> +            return documentbase.toExternalForm();
>> +        }
>> +
>> +    }
>> +
>> +    private static String ensureSlashTail(String s) {
>
> Hmm, "normlaized".
>
Well crap. :(

Thank you for eyballing it. I will try to fix it Once I backport all the changesets.
Andrew Azores saw the code when we got RH1233697 and RH1233667


I will not fix it immediately, but hopefully will not forget before release.

J.