[jboss-cvs] JBossAS SVN: r88601 - branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-05-11 03:48:23 -0400 (Mon, 11 May 2009)
New Revision: 88601

Modified:
   branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java
Log:
[JBAS-6856] Close the URLCL, use concurrent.jar on the Loading/Starting CL

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java	2009-05-11 07:28:37 UTC (rev 88600)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java	2009-05-11 07:48:23 UTC (rev 88601)
@@ -24,8 +24,10 @@
 import gnu.getopt.Getopt;
 import gnu.getopt.LongOpt;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -93,6 +95,8 @@
    public static final String[] DEFAULT_BOOT_LIBRARY_LIST =
    {
          // Logging
+         "concurrent.jar",
+         // Logging
          "log4j-boot.jar", 
          "jboss-logging-spi.jar", 
          "jboss-logging-log4j.jar",
@@ -345,6 +349,22 @@
       {
          // Reset the CL 
          SecurityActions.setThreadContextClassLoader(tccl);
+         
+         /*
+          * Close the URLCL, if JDK7+
+          * JBBOOT-23
+          */
+         if (loadingCl != null && loadingCl instanceof Closeable)
+         {
+            try
+            {
+               ((Closeable) loadingCl).close();
+            }
+            catch (IOException ioe)
+            {
+               // Swallow
+            }
+         }
       }
    }