[jboss-cvs] JBossAS SVN: r67654 - trunk/server/src/main/org/jboss/ejb/deployers.

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

Author: wolfc
Date: 2007-11-30 08:09:39 -0500 (Fri, 30 Nov 2007)
New Revision: 67654

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
JBAS-4506: don't merge non-existent specMetaData

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2007-11-30 10:47:31 UTC (rev 67653)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2007-11-30 13:09:39 UTC (rev 67654)
@@ -72,9 +72,14 @@
       EjbJarMetaData annotatedMetaData = unit.getAttachment(key, EjbJarMetaData.class);
       if(annotatedMetaData != null)
       {
-         EjbJarMetaData specMerged = new EjbJar30MetaData();
-         AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
-         specMetaData = specMerged;
+         if(specMetaData != null)
+         {
+            EjbJarMetaData specMerged = new EjbJar30MetaData();
+            AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
+            specMetaData = specMerged;
+         }
+         else
+            specMetaData = annotatedMetaData;
       }
 
       // Create a merged view