[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment OpenEJBModuleBuilder.java

[chirino]

chirino     2004/11/15 18:04:40

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Log:

  Fixed NPE since AssemblyDescriptor may not be set.
  
  Revision  Changes    Path
  1.8       +6 -4      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OpenEJBModuleBuilder.java 12 Nov 2004 21:29:21 -0000      1.7
  +++ OpenEJBModuleBuilder.java 15 Nov 2004 23:04:40 -0000      1.8
  @@ -455,9 +455,11 @@
       private static Set collectRoleNames(EjbJarType ejbJar) {
           Set roleNames = new HashSet();
   
  -        SecurityRoleType[] securityRoles = 
ejbJar.getAssemblyDescriptor().getSecurityRoleArray();
  -        for (int i=0; i<securityRoles.length; i++) {
  -            roleNames.add(securityRoles[i].getRoleName().getStringValue());
  +        if( ejbJar.isSetAssemblyDescriptor() ) {
  +             SecurityRoleType[] securityRoles = 
ejbJar.getAssemblyDescriptor().getSecurityRoleArray();
  +             for (int i=0; i<securityRoles.length; i++) {
  +                 
roleNames.add(securityRoles[i].getRoleName().getStringValue());
  +             }
           }
   
           return roleNames;