[rfc][icedtea-web] do not re-download href if environment is offline

[Jie Kang]

----- Original Message -----
> The whole offline environment is already in 1.5. Ok for head nd 1.5 too?

Hello,

I am not sure what the intentions of this change are.

This changes the behaviour of the function. Is this intended?

fromUrl(...):
            [...]
            if (!isLocal && haveHref){
                //this is case when remote file have href to different file
                if (!location.equals(file.getSourceLocation())){
                    //mark local true, so the folowing condition will be true and 
                    //new jnlp file will be downlaoded
                    isLocal = true;
                    //maybe this check is to strict, and will force redownlaod to often
                    //another check can be just on jnlp name. But it will not work
                    //if the href will be the file of same name, but on diferent path (or even domain)
                }
            }
            if (isLocal && haveHref) {
                file = new JNLPFile(file.getSourceLocation(), parserSettings);
            }
            [...]

For the case: (!isLocal && haveHref) : it checks for (!location.equals(file.getSourceLocation()), which if true (not equal), sets isLocal to true, in order to use the JNLP file located at file.getSourceLocation() by taking advantage of the next if-statement (isLocal && haveHref).


If you add JNLPRuntime.isOnline() check to the second if-statement, then the above code will have new behaviour when offline: itt will not try to load the JNLP file located at file.getSourceLocation() anymore.


I think a more correct fix would be:

fromUrl(...):
            [...]
            if (!isLocal && haveHref && !location.equals(file.getSourceLocation()){
                file = new JNLPFile(file.getSourceLocation(), parserSettings);
            }
            if (isLocal && haveHref && JNLPRuntime.isOnline()) {
                file = new JNLPFile(file.getSourceLocation(), parserSettings);
            }
            [...]




Also, if you look at the constructor for JNLPFile: new JNLPFile(url, parsersettings), the code:

            if (file.getSourceLocation() != null) {
                haveHref = true;
            }

is redundant, as file.getSourceLocation is never null. This isn't as big of an issue though.




Regards,



> 
> J.
> 

-- 

Jie Kang