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

[Norman Richards]

  User: nrichards
  Date: 07/08/29 17:23:32

  Modified:    src/main/org/jboss/seam/init  ComponentDescriptor.java
  Log:
  fix errors when components are in default package
  
  Revision  Changes    Path
  1.16      +6 -2      jboss-seam/src/main/org/jboss/seam/init/ComponentDescriptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ComponentDescriptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/ComponentDescriptor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ComponentDescriptor.java	18 Jul 2007 14:37:30 -0000	1.15
  +++ ComponentDescriptor.java	29 Aug 2007 21:23:32 -0000	1.16
  @@ -103,8 +103,12 @@
   
       private boolean isAutoCreateAnnotationPresent()
       {
  -        return componentClass.isAnnotationPresent(AutoCreate.class) || 
  -           componentClass.getPackage().isAnnotationPresent(AutoCreate.class);
  +        if (componentClass.isAnnotationPresent(AutoCreate.class)) {
  +           return true;
  +        }
  +   
  +        Package pkg = componentClass.getPackage();
  +        return pkg!=null && pkg.isAnnotationPresent(AutoCreate.class);
       }
   
       public String[] getDependencies()