[jboss-cvs] JBossAS SVN: r72629 - in projects/jboss-cl/trunk: classloading/src/main/org/jboss/classloading/spi/visitor and 1 other directories.

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

Author: alesj
Date: 2008-04-23 11:26:33 -0400 (Wed, 23 Apr 2008)
New Revision: 72629

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
   projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/Module.java
   projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/visitor/ResourceContext.java
Log:
Null checks.
Removing null check in unsupported Module's visit method.
javadocs


Modified: projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/Module.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/Module.java	2008-04-23 14:39:54 UTC (rev 72628)
+++ projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/Module.java	2008-04-23 15:26:33 UTC (rev 72629)
@@ -299,8 +299,6 @@
     */
    public void visit(ResourceVisitor visitor, ResourceFilter filter)
    {
-      if (visitor == null)
-         throw new IllegalArgumentException("Null visitor");
       throw new UnsupportedOperationException("The module " + getContextName() + " does not support filtering: " + getClass().getName());
    }
    

Modified: projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/visitor/ResourceContext.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/visitor/ResourceContext.java	2008-04-23 14:39:54 UTC (rev 72628)
+++ projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/visitor/ResourceContext.java	2008-04-23 15:26:33 UTC (rev 72629)
@@ -59,6 +59,7 @@
          throw new IllegalArgumentException("Null resourceName");
       if (classLoader == null)
          throw new IllegalArgumentException("Null classloader");
+
       this.url = url;
       this.resourceName = resourceName;
       this.classLoader = classLoader;
@@ -116,8 +117,13 @@
    
    /**
     * Load a class
+    *
+    * Do isClass check before,
+    * unless you want to handle exception
+    * when resource is not actually a class. 
     * 
-    * @return the class or null if it is not a class
+    * @return the class from resource
+    * @throws RuntimeException for any errors during class loading
     */
    public Class<?> loadClass()
    {

Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java	2008-04-23 14:39:54 UTC (rev 72628)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java	2008-04-23 15:26:33 UTC (rev 72629)
@@ -105,6 +105,13 @@
     */
    VFSResourceVisitor(VirtualFile[] roots, ClassFilter included, ClassFilter excluded, ClassLoader classLoader, ResourceVisitor visitor, ResourceFilter filter)
    {
+      if (roots == null)
+         throw new IllegalArgumentException("Null roots");
+      if (classLoader == null)
+         throw new IllegalArgumentException("Null classloader");
+      if (visitor == null)
+         throw new IllegalArgumentException("Null visitor");
+
       this.roots = roots;
       this.included = included;
       this.excluded = excluded;