[jboss-cvs] JBossAS SVN: r83461 - projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency.

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

Author: adrian at jboss.org
Date: 2009-01-27 06:00:54 -0500 (Tue, 27 Jan 2009)
New Revision: 83461

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoading.java
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
Log:
[JBCL-80] - Tidyup module->classloader processing

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoading.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoading.java	2009-01-27 11:00:21 UTC (rev 83460)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/ClassLoading.java	2009-01-27 11:00:54 UTC (rev 83461)
@@ -135,6 +135,7 @@
     * 
     * @param loader the classloader
     * @return the module or null if the classloader does not correspond to a registered module classloader
+    * @throws SecurityException if the caller doesn't have <code>new RuntimePermision("getClassLoader")</code>
     */
    public static Module getModuleForClassLoader(ClassLoader loader)
    {
@@ -146,9 +147,16 @@
     * 
     * @param module the module
     * @return the classloader or null if the module does not correspond to a registered classloader module
+    * @throws SecurityException if the caller doesn't have <code>new RuntimePermision("getClassLoader")</code>
     */
    public static ClassLoader getClassLoaderForModule(Module module)
    {
-      return Module.getClassLoaderForModule(module);
+      SecurityManager sm = System.getSecurityManager();
+      if (sm != null)
+         sm.checkPermission(new RuntimePermission("getClassLoader"));
+      
+      if (module == null)
+         return null;
+      return module.getClassLoader();
    }
 }

Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2009-01-27 11:00:21 UTC (rev 83460)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/Module.java	2009-01-27 11:00:54 UTC (rev 83461)
@@ -61,7 +61,6 @@
 {
    /** The modules by classloader */
    private static Map<ClassLoader, Module> modulesByClassLoader = new ConcurrentHashMap<ClassLoader, Module>();
-   private static Map<Module, ClassLoader> classLoadersByModule = new ConcurrentHashMap<Module, ClassLoader>();
    
    /** The context name */
    private String contextName;
@@ -99,7 +98,6 @@
          throw new IllegalArgumentException("Null classloader");
 
       modulesByClassLoader.put(classLoader, module);
-      classLoadersByModule.put(module, classLoader);
    }
 
    /**
@@ -117,7 +115,6 @@
          throw new IllegalArgumentException("Null classloader");
 
       modulesByClassLoader.remove(classLoader);
-      classLoadersByModule.remove(module);
    }
    
    /**
@@ -364,6 +361,7 @@
     * 
     * @param cl the classloader
     * @return the module or null if the classloader does not correspond to a registered module classloader
+    * @throws SecurityException if the caller doesn't have <code>new RuntimePermision("getClassLoader")</code>
     */
    static Module getModuleForClassLoader(ClassLoader cl)
    {
@@ -379,25 +377,6 @@
    }
    
    /**
-    * Find the classloader for a module
-    * 
-    * @param module the module
-    * @return the classloader or null if the module does not correspond to a registered classloader module
-    */
-   static ClassLoader getClassLoaderForModule(Module module)
-   {
-      SecurityManager sm = System.getSecurityManager();
-      if (sm != null)
-         sm.checkPermission(new RuntimePermission("getClassLoader"));
-      
-      // Determine the module (if any) for the classloader 
-      if (module != null)
-         return classLoadersByModule.get(module);
-      // Unknown
-      return null;
-   }
-   
-   /**
     * Find the module that loads a class
     * 
     * @param className the class name