[jboss-cvs] JBossAS SVN: r82707 - projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb.

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

Author: petemuir
Date: 2009-01-08 11:47:59 -0500 (Thu, 08 Jan 2009)
New Revision: 82707

Modified:
   projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java
Log:
Exceptions

Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java	2009-01-08 16:42:52 UTC (rev 82706)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb/JBossEjbResolver.java	2009-01-08 16:47:59 UTC (rev 82707)
@@ -53,6 +53,10 @@
 
    public Object resolveEjb(InjectionPoint injectionPoint, Naming naming)
    {
+      if (!injectionPoint.isAnnotationPresent(EJB.class))
+      {
+         throw new IllegalArgumentException("No @EJB annotation found on injection point " + injectionPoint);
+      }
       EJB annotation = injectionPoint.getAnnotation(EJB.class);
       // Get properties from the annotation
       String beanName = annotation.beanName();
@@ -81,11 +85,19 @@
       }
 
       String jndiName = JBossEjb.lookupEjbReferenceResolver(controller).resolveEjb(topLevelDeploymentUnit, new EjbReference(beanName, beanInterface, mappedName));
+      if (jndiName == null)
+      {
+         throw new IllegalStateException("No EJBs available which can be injected into " + injectionPoint);
+      }
       return naming.lookup(jndiName, Object.class);
    }
 
    public Object resolvePersistenceUnit(InjectionPoint injectionPoint, Naming naming)
    {
+      if (!injectionPoint.isAnnotationPresent(PersistenceContext.class))
+      {
+         throw new IllegalArgumentException("No @PersistenceContext annotation found on injection point " + injectionPoint);
+      }
       if (injectionPoint.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED))
       {
          throw new UnsupportedOperationException("Cannot inject an extended persistence context into " + injectionPoint);