[jboss-cvs] JBossAS SVN: r100746 - in projects/jboss-cl/trunk/classloader/src: test/java/org/jboss/test/classloader/junit/notsupport and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 9 08:01:15 EST 2010
Author: adrian at jboss.org
Date: 2010-02-09 08:01:15 -0500 (Tue, 09 Feb 2010)
New Revision: 100746
Added:
projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/notsupport/NotSupport2.java
Modified:
projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java
Log:
[JBCL-145] - Allow java classes to be loaded from a shutdown classloader - also fixed the isolated mock unregister test to actually test was it is supposed to be testing.
Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java 2010-02-09 12:46:35 UTC (rev 100745)
+++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/classloader/spi/base/BaseClassLoader.java 2010-02-09 13:01:15 UTC (rev 100746)
@@ -54,6 +54,7 @@
import org.jboss.classloader.spi.Loader;
import org.jboss.classloader.spi.PackageInformation;
import org.jboss.classloader.spi.ShutdownPolicy;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.logging.Logger;
import org.jboss.util.collection.Iterators;
@@ -548,7 +549,12 @@
if (domain != null)
return domain.getResource(this, name);
- return getResourceLocally(name, trace);
+ URL url = getResourceLocally(name, trace);
+ if (url != null)
+ return url;
+ if (ClassFilterUtils.JAVA_ONLY.matchesResourcePath(name))
+ return getSystemResource(name);
+ return null;
}
@Override
@@ -570,9 +576,19 @@
Set<URL> resourceURLs = new TreeSet<URL>(ClassLoaderUtils.URLComparator.INSTANCE);
if (domain != null)
+ {
domain.getResources(this, name, resourceURLs);
+ }
else
+ {
+ if (ClassFilterUtils.JAVA_ONLY.matchesResourcePath(name))
+ {
+ Enumeration<URL> urls = getSystemResources(name);
+ while (urls.hasMoreElements())
+ resourceURLs.add(urls.nextElement());
+ }
getResourcesLocally(name, resourceURLs, trace);
+ }
return resourceURLs;
}
@@ -871,6 +887,10 @@
{
Class<?> result = loadClassLocally(name, trace);
+ // Try the classpath for java classes
+ if (result == null && ClassFilterUtils.JAVA_ONLY.matchesClassName(name))
+ result = getSystemClassLoader().loadClass(name);
+
// So this is almost certainly a classloader leak
if (result == null)
throw new IllegalStateException(this + " classLoader is not connected to a domain (probably undeployed?) for class " + name);
Added: projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/notsupport/NotSupport2.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/notsupport/NotSupport2.java (rev 0)
+++ projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/notsupport/NotSupport2.java 2010-02-09 13:01:15 UTC (rev 100746)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.classloader.junit.notsupport;
+
+import org.jboss.test.classloader.junit.support.Support;
+
+/**
+ * NotSupport.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class NotSupport2 extends Support
+{
+
+}
Modified: projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java 2010-02-09 12:46:35 UTC (rev 100745)
+++ projects/jboss-cl/trunk/classloader/src/test/java/org/jboss/test/classloader/junit/test/IsolatedClassLoaderUnitTestCase.java 2010-02-09 13:01:15 UTC (rev 100746)
@@ -42,6 +42,9 @@
{
private static final String NOT_SUPPORT_PACKAGE = "org.jboss.test.classloader.junit.notsupport";
private static final String NOT_SUPPORT_CLASS = NOT_SUPPORT_PACKAGE + ".NotSupport";
+ private static final String NOT_SUPPORT_CLASS2 = NOT_SUPPORT_PACKAGE + ".NotSupport2";
+ private static final String SUPPORT_PACKAGE = "org.jboss.test.classloader.junit.support";
+ private static final String SUPPORT_CLASS = SUPPORT_PACKAGE + ".Support";
public static Test suite()
{
@@ -103,12 +106,15 @@
public void testUnregisterClassLoader() throws Exception
{
+ Class<?> clazz = getClass().getClassLoader().loadClass(SUPPORT_CLASS);
+ assertEquals(getClass().getClassLoader(), clazz.getClassLoader());
+
ClassLoader classLoader = createClassLoader("NewClassLoader", NOT_SUPPORT_PACKAGE);
unregisterClassLoader(classLoader);
try
{
- classLoader.loadClass(NOT_SUPPORT_CLASS);
+ classLoader.loadClass(NOT_SUPPORT_CLASS2);
fail("Should not be here!");
}
catch (Throwable t)
@@ -118,7 +124,7 @@
try
{
- getClass().getClassLoader().loadClass(NOT_SUPPORT_CLASS);
+ getClass().getClassLoader().loadClass(NOT_SUPPORT_CLASS2);
fail("Should not be here!");
}
catch (Throwable t)
More information about the jboss-cvs-commits
mailing list