From ec0b59d2306ae4ff4f8abd1d89e38391ea4cf567 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 16 Nov 2012 15:54:02 -0500
Subject: [PATCH] URLClassLoader is Closeable in Java 7, no need for a
 workaround.

---
 core/src/main/java/hudson/ClassicPluginStrategy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 0e21957fab..f629930570 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -201,7 +201,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
                 return classLoader;
             }
         }
-        if(useAntClassLoader) {
+        if(useAntClassLoader && !Closeable.class.isAssignableFrom(URLClassLoader.class)) {
             // using AntClassLoader with Closeable so that we can predictably release jar files opened by URLClassLoader
             AntClassLoader2 classLoader = new AntClassLoader2(parent);
             classLoader.addPathFiles(paths);
@@ -564,6 +564,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
 
     /**
      * {@link AntClassLoader} with a few methods exposed and {@link Closeable} support.
+     * Deprecated as of Java 7, retained only for Java 5/6.
      */
     private static final class AntClassLoader2 extends AntClassLoader implements Closeable {
         private final Vector pathComponents;