[jboss-cvs] JBossAS SVN: r66739 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: wolfc
Date: 2007-11-05 10:59:36 -0500 (Mon, 05 Nov 2007)
New Revision: 66739

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
Log:
EJBTHREE-1067: fixed NPE

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-05 15:58:43 UTC (rev 66738)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-11-05 15:59:36 UTC (rev 66739)
@@ -619,7 +619,7 @@
          }
 
          ActivationConfigMetaData activationConfig = mdb.getActivationConfig();
-         if (activationConfig != null)
+         if (activationConfig != null && activationConfig.getActivationConfigProperties() != null)
          {
             for (ActivationConfigPropertyMetaData property : activationConfig.getActivationConfigProperties())
             {