[rfc][icedtea-web] minor fix for possible NPE (non fatal) during splashscreen creation

[Adam Domurad]

On 12/21/2012 08:18 AM, Jiri Vanek wrote:
> And added more verbose messages for output.
> Ok to head?
>
>
> 2012-12-21  Jiri Vanek <jvanek at redhat.com>
>
>     Minor fix for possible NPE (non fatal) during splashscreen creation
>     * netx/net/sourceforge/jnlp/resources/Messages.properties:
>     * netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties:
>     Added messages for user (SPLASHdefaultHomepage)
>     (SPLASHerrorInInformation)(SPLASHmissingInformation).
>     * 
> netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
>     (createFromJNLP) catch of NPE replaced by conditions with proper 
> messa
>
> J.
>
> btw: this was cought by remote tests :)
>
> diff -r a24c48429ff1 netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Dec 21 13:19:14 2012 +0100
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Dec 21 14:12:08 2012 +0100
> @@ -470,3 +470,6 @@
>   SPLASHcfl = Can't follow link to
>   SPLASHvendorsInfo = Information from vendor of your application
>   SPLASHanotherInfo = Another available info
> +SPLASHdefaultHomepage = Unspecified homepage, verify source rather

Maybe better than 'verify source rather' is 'verify the source of the 
application'

> +SPLASHerrorInInformation = Error during loading of information element, verify source rather
> +SPLASHmissingInformation = Information element is missing, verify source rather
> diff -r a24c48429ff1 netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties	Fri Dec 21 13:19:14 2012 +0100
> +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs_CZ.properties	Fri Dec 21 14:12:08 2012 +0100
> @@ -466,3 +466,6 @@
>   SPLASHcfl= Nelze \u010d\u00edst odkaz
>   SPLASHvendorsInfo= Informace od dodavatele va\u0161\u00ed aplikace
>   SPLASHanotherInfo= Dal\u0161\u00ed dostupn\u00e9 informace
> +SPLASHdefaultHomepage = Nespecifikovan\u00e1 domovsk\u00e1 st\u00e1nka, je doporu\u010deno zkontrolovat zdroj
> +SPLASHerrorInInformation = Chyba na\u010d\u00edt\u00e1n\u00ed informa\u010dn\u00edho elementu, je doporu\u010deno zkontrolovat zdroj
> +SPLASHmissingInformation = Informa\u010dn\u00ed element chyb\u00fd, je doporu\u010deno zkontrolovat zdroj

My CZ is a little rusty so I'll trust you here. ;-)

> \ No newline at end of file
> diff -r a24c48429ff1 netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
> --- a/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java	Fri Dec 21 13:19:14 2012 +0100
> +++ b/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java	Fri Dec 21 14:12:08 2012 +0100
> @@ -44,6 +44,7 @@
>   import java.util.List;
>   import net.sourceforge.jnlp.InformationDesc;
>   import net.sourceforge.jnlp.JNLPFile;
> +import net.sourceforge.jnlp.runtime.Translator;
>   
>   /**
>    * This class is wrapper arround <information> tag which should
> @@ -193,12 +194,31 @@
>       }
>   
>       public static InformationElement createFromJNLP(JNLPFile file) {
> -        if (file == null) {
> -            return null;
> -        }
>           try {
> +            if (file == null) {
> +                String message = Translator.R(InfoItem.SPLASH + "errorInInformation");
> +                InformationElement ie = new InformationElement();
> +                ie.setHomepage("");
> +                ie.setTitle(message);
> +                ie.setvendor("");
> +                ie.addDescription(message);
> +                return ie;
> +            }
> +            if (file.getInformation() == null) {
> +                String message = Translator.R(InfoItem.SPLASH + "missingInformation");
> +                InformationElement ie = new InformationElement();
> +                ie.setHomepage("");
> +                ie.setTitle(message);
> +                ie.setvendor("");
> +                ie.addDescription(message);

Looks like you could extract a little method here.

> +                return ie;
> +            }
>               InformationElement ie = new InformationElement();
> -            ie.setHomepage(file.getInformation().getHomepage().toString());
> +            String homePage = Translator.R(InfoItem.SPLASH + "defaultHomepage");
> +            if (file.getInformation().getHomepage() != null) {
> +                homePage = file.getInformation().getHomepage().toString();
> +            }
> +            ie.setHomepage(homePage);
>               ie.setTitle(file.getInformation().getTitle());
>               ie.setvendor(file.getInformation().getVendor());
>               ie.addDescription(file.getInformation().getDescriptionStrict((String) (InformationDesc.DEFAULT)));
> @@ -208,7 +228,13 @@
>               return ie;
>           } catch (Exception ex) {
>               ex.printStackTrace();
> -            return null;
> +            String message = Translator.R(InfoItem.SPLASH + "errorInInformation");
> +            InformationElement ie = new InformationElement();
> +            ie.setHomepage("");
> +            ie.setTitle(message);
> +            ie.setvendor("");
> +            ie.addDescription(ex.getMessage());
> +            return ie;
>           }
>       }
>   }

OK for head, feel free to do a simple method extraction before pushing.

Thanks,
-Adam
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121221/2c03ef1d/attachment.html