[icedtea-web] RFC: fix exception in debug output from JNLPClassLoader

[Dr Andrew John Hughes]

On 15:55 Fri 24 Dec     , Omair Majid wrote:
> Hi,
> 
> The attached patch fixes an exception that happens when printing debug 
> output.
> 
> The exception only happens when javaws is run in verbose mode and the 
> JVM is shutting down - so it does not affect the behaviour of the JNLP 
> application.
> 
> Any objections?
> 
> ChangeLog
> 2010-12-24  Omair Majid  <omajid at redhat.com>
> 
>      * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
>      (installShutdownHooks): Only print when not null.
> 
> Cheers,
> Omair

Good spot.  Approved.

If this is present in 1.0 too, it should probably be backported.

> diff -r bbbe02c58ddc netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Dec 20 13:37:59 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri Dec 24 15:49:53 2010 -0500
> @@ -182,16 +182,15 @@
>          Runtime.getRuntime().addShutdownHook(new Thread() {
>              @Override
>              public void run() {
> -                if (JNLPRuntime.isDebug()) {
> -                    System.out.println("Cleaning up native directory" + nativeDir.getAbsolutePath());
> -                }
> -
>                  /*
>                   * Delete only the native dir created by this classloader (if
>                   * there is one). Other classloaders (parent, peers) will all
>                   * cleanup things they created
>                   */
>                  if (nativeDir != null) {
> +                    if (JNLPRuntime.isDebug()) {
> +                        System.out.println("Cleaning up native directory" + nativeDir.getAbsolutePath());
> +                    }
>                      try {
>                          FileUtils.recursiveDelete(nativeDir,
>                                  new File(System.getProperty("java.io.tmpdir")));


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8