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

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

Author: scott.stark at jboss.org
Date: 2008-04-17 16:03:03 -0400 (Thu, 17 Apr 2008)
New Revision: 72384

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
Handle annotation only deployments

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-04-17 20:02:29 UTC (rev 72383)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-04-17 20:03:03 UTC (rev 72384)
@@ -70,12 +70,12 @@
    {
       EjbJarMetaData specMetaData = unit.getAttachment(EjbJarMetaData.class);
       JBossMetaData metaData = unit.getAttachment(JBossMetaData.class);
-      if(specMetaData == null && metaData == null)
-         return;
-
       // Check for an annotated view
       String key = AnnotationMetaDataDeployer.EJB_ANNOTATED_ATTACHMENT_NAME;
       EjbJar3xMetaData annotatedMetaData = unit.getAttachment(key, EjbJar3xMetaData.class);
+      if(specMetaData == null && metaData == null && annotatedMetaData == null)
+         return;
+
       if(annotatedMetaData != null)
       {
          if(specMetaData != null)
@@ -126,6 +126,7 @@
 
       // Output the merged JBossMetaData
       unit.getTransientManagedObjects().addAttachment(JBossMetaData.class, mergedMetaData);
+      unit.addAttachment(EJB_MERGED_ATTACHMENT_NAME, mergedMetaData, JBossMetaData.class);
    }
 
 }