svn commit: r1333244 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

[rmannibucau]

Author: rmannibucau
Date: Wed May  2 22:59:04 2012
New Revision: 1333244

URL: http://svn.apache.org/viewvc?rev=1333244&view=rev
Log:
altdd can contain a Beans object

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1333244&r1=1333243&r2=1333244&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 Wed May  2 22:59:04 2012
@@ -428,7 +428,8 @@ public class ReadDescriptors implements 
     private void readBeans(EjbModule ejbModule, AppModule appModule) throws 
OpenEJBException {
         if (ejbModule.getBeans() != null) return;
 
-        final Source data = getSource(ejbModule.getAltDDs().get("beans.xml"));
+        final Object raw = ejbModule.getAltDDs().get("beans.xml");
+        final Source data = getSource(raw);
         if (data != null) {
             try {
                 Beans beans = readBeans(data.get());
@@ -436,6 +437,8 @@ public class ReadDescriptors implements 
             } catch (IOException e) {
                 throw new OpenEJBException(e);
             }
+        } else if (raw instanceof Beans) {
+            ejbModule.setBeans((Beans) raw);
         } else {
 //            DeploymentLoader.logger.debug("No beans.xml found assuming 
annotated beans present: " + appModule.getJarLocation() + ", module: " + 
ejbModule.getModuleId());
 //            ejbModule.setBeans(new Beans());