[jboss-cvs] JBossAS SVN: r100159 - projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb.

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

Author: pete.muir at jboss.org
Date: 2010-01-30 06:43:11 -0500 (Sat, 30 Jan 2010)
New Revision: 100159

Modified:
   projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEJBDescriptorAdaptor.java
Log:
better error message

Modified: projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEJBDescriptorAdaptor.java
===================================================================
--- projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEJBDescriptorAdaptor.java	2010-01-30 09:59:25 UTC (rev 100158)
+++ projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEJBDescriptorAdaptor.java	2010-01-30 11:43:11 UTC (rev 100159)
@@ -15,19 +15,25 @@
 
    public JBossEJBDescriptorAdaptor(JBossEnterpriseBeanMetaData enterpriseBeanMetaData, DeploymentUnit deploymentUnit, EjbReferenceResolver resolver)
    {
-      try
+      if (enterpriseBeanMetaData.getEjbClass() != null)
       {
-         this.beanClass = (Class<T>) Reflections.classForName(enterpriseBeanMetaData.getEjbClass(), deploymentUnit.getClassLoader());
+         try
+         {
+            this.beanClass = (Class<T>) Reflections.classForName(enterpriseBeanMetaData.getEjbClass(), deploymentUnit.getClassLoader());
+         }
+         catch (ClassCastException e)
+         {
+            throw new IllegalStateException("Error loading EJB Session bean class", e);
+         }
+         catch (ClassNotFoundException e)
+         {
+            throw new IllegalStateException("Cannot load EJB Session bean class", e);
+         }
       }
-      catch (ClassCastException e) 
+      else
       {
-         throw new IllegalStateException("Error loading EJB Session bean class", e);
+         throw new IllegalStateException("EJB class is null. EJB " + enterpriseBeanMetaData);
       }
-      catch (ClassNotFoundException e)
-      {
-         throw new IllegalStateException("Cannot load EJB Session bean class", e);
-      }
-      
       this.ejbName = enterpriseBeanMetaData.getEjbName();
    }
 
@@ -40,7 +46,7 @@
    {
       return ejbName;
    }
-   
+
    @Override
    public String toString()
    {
@@ -63,9 +69,9 @@
          builder.append(" (MDB)");
       }
       builder.append("; BeanClass: " + getBeanClass() + "; Local Business Interfaces: " + getLocalBusinessInterfaces());
-      return builder.toString(); 
+      return builder.toString();
    }
-   
+
    @Override
    public boolean equals(Object other)
    {
@@ -79,7 +85,7 @@
          return false;
       }
    }
-   
+
    @Override
    public int hashCode()
    {