[jboss-cvs] JBossAS SVN: r78830 - trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2008-09-24 11:53:58 -0400 (Wed, 24 Sep 2008)
New Revision: 78830

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
Log:
[JBAS-5766] Fix NPE in annotation deployer if deployment contains an empty jboss-aop.xml file

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2008-09-24 15:09:26 UTC (rev 78829)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2008-09-24 15:53:58 UTC (rev 78830)
@@ -110,6 +110,9 @@
          {
             deployment = new AOPDeployment();
             unit.getTransientManagedObjects().addAttachment(AOPDeployment.class.getName(), deployment, AOPDeployment.class);
+         }
+         if (deployment.getBeanFactories() == null)
+         {
             deployment.setBeanFactories(new ArrayList<BeanMetaDataFactory>());
          }
          deployment.getBeanFactories().addAll(factories);