Mercurial > hg > openjdk > jdk6 > langtools

changeset 64:f805f6eeebbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6881317: regression: NPE in CloseableURLClassLoader Reviewed-by: darcy
author jjg
date Mon, 14 Sep 2009 17:16:07 -0700
parents 831ea465b8d2
children 438bf1bab066
files src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Fri Sep 11 10:54:59 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Mon Sep 14 17:16:07 2009 -0700
@@ -69,8 +69,10 @@
                 if (l.getClass().getName().equals("sun.misc.URLClassPath$JarLoader")) {
                     Field jarField = l.getClass().getDeclaredField("jar");
                     JarFile jar = (JarFile) getField(l, jarField);
-                    //System.err.println("CloseableURLClassLoader: closing " + jar);
-                    jar.close();
+                    if (jar != null) {
+                        //System.err.println("CloseableURLClassLoader: closing " + jar);
+                        jar.close();
+                    }
                 }
             }
         } catch (Throwable t) {