[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment EJBConfigBuilder.java

[dblevins]

dblevins    2004/05/03 02:36:39

  Modified:    modules/core/src/java/org/openejb/deployment
                        EJBConfigBuilder.java
  Log:

  Fix for NullPointerException when there is no assembly descriptor section
  for creating container-managed transaction attributes.
  
  Revision  Changes    Path
  1.17      +8 -3      
openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java
  
  Index: EJBConfigBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- EJBConfigBuilder.java     23 Apr 2004 03:40:23 -0000      1.16
  +++ EJBConfigBuilder.java     3 May 2004 06:36:39 -0000       1.17
  @@ -87,6 +87,7 @@
   import org.apache.geronimo.naming.jmx.JMXReferenceFactory;
   import org.apache.geronimo.transaction.UserTransactionImpl;
   import org.apache.geronimo.xbeans.j2ee.CmpFieldType;
  +import org.apache.geronimo.xbeans.j2ee.ContainerTransactionType;
   import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
   import org.apache.geronimo.xbeans.j2ee.EjbJarType;
   import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
  @@ -327,8 +328,12 @@
               openejbBeans.put(mdbObjectName, messageDrivenBean);
           }
   
  -
  -        TransactionPolicyHelper transactionPolicyHelper = new 
TransactionPolicyHelper(ejbJar.getAssemblyDescriptor().getContainerTransactionArray());
  +        TransactionPolicyHelper transactionPolicyHelper;
  +        if (ejbJar.getAssemblyDescriptor() == null || 
ejbJar.getAssemblyDescriptor().getContainerTransactionArray() == null){
  +            transactionPolicyHelper = new TransactionPolicyHelper(new 
ContainerTransactionType[0]);
  +        } else {
  +            transactionPolicyHelper = new 
TransactionPolicyHelper(ejbJar.getAssemblyDescriptor().getContainerTransactionArray());
  +        }
   
           // Session Beans
           EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();