[jboss-cvs] jboss-seam/src/main/org/jboss/seam/deployment ...

[Norman Richards]

  User: nrichards
  Date: 06/11/28 14:05:08

  Modified:    src/main/org/jboss/seam/deployment  NamespaceScanner.java
  Log:
  JBSEAM-589: quick fix for package loading problem
  
  Revision  Changes    Path
  1.3       +10 -3     jboss-seam/src/main/org/jboss/seam/deployment/NamespaceScanner.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NamespaceScanner.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/deployment/NamespaceScanner.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- NamespaceScanner.java	16 Nov 2006 17:25:05 -0000	1.2
  +++ NamespaceScanner.java	28 Nov 2006 19:05:08 -0000	1.3
  @@ -4,10 +4,14 @@
   import java.util.Set;
   
   import org.jboss.seam.annotations.Namespace;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   public class NamespaceScanner
       extends Scanner 
   {
  +    private static final Log log = LogFactory.getLog(NamespaceScanner.class);
  +
       private Set<Package> packages;
       
       public NamespaceScanner(String resourceName)
  @@ -43,13 +47,16 @@
       {
           if (name.endsWith("/package-info.class")) {
               String packageName = filenameToPackageName(name);
  -            // XXX - can't get package info from a classloader directly?
               Package pkg = Package.getPackage(packageName);
  +            if (pkg == null) {
  +                log.warn("Cannot load package Dinfo for " + packageName);
  +            } else {
               if (pkg.getAnnotation(Namespace.class) != null) {
                   packages.add(pkg);
               }
           }
       }
  +    }