svn commit: r506425 - /geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java

[gd...@apache.org]

Author: gdamour
Date: Mon Feb 12 03:49:46 2007
New Revision: 506425

URL: http://svn.apache.org/viewvc?view=rev&rev=506425
Log:
META-INF/geronimo-dependency.xml should only be loaded from the URL
of the provided Artifact and the system class loader must be excluded
from the search as it may result in an infinite loop.

GERONIMO-2823 System class loader should not be searched for resource 
META-INF/geronimo-dependency.xml by AbstractRepository.getDependencies

Modified:
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java?view=diff&rev=506425&r1=506424&r2=506425
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java Mon Feb 12 03:49:46 2007
@@ -121,7 +121,12 @@
         } catch (MalformedURLException e) {
             throw (IllegalStateException)new IllegalStateException("Unable to get URL for dependency " + artifact).initCause(e);
         }
-        ClassLoader depCL = new URLClassLoader(new URL[]{url}, ClassLoader.getSystemClassLoader());
+        ClassLoader depCL = new URLClassLoader(new URL[]{url}, new ClassLoader() {
+            @Override
+            public URL getResource(String name) {
+                return null;
+            }
+        });
         InputStream is = depCL.getResourceAsStream("META-INF/geronimo-dependency.xml");
         try {
             if (is != null) {