# HG changeset patch
# User jjg
# Date 1252973580 25200
# Node ID 556fef8e4dbd4299ba6a45ed4d8250210a47ccfe
# Parent  7f888c00fad7cc81bd12c203564c642b15be4dc6
6881317: regression: NPE in CloseableURLClassLoader
Reviewed-by: darcy

diff -r 7f888c00fad7 -r 556fef8e4dbd langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java
--- a/langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java	Tue Sep 08 14:08:26 2009 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java	Mon Sep 14 17:13:00 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) {