[jboss-cvs] JBossAS SVN: r70933 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3.

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

Author: wolfc
Date: 2008-03-17 17:56:25 -0400 (Mon, 17 Mar 2008)
New Revision: 70933

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
Log:
EJBTHREE-1226: throwing IllegalArgumentException when nothing is found

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java	2008-03-17 21:32:14 UTC (rev 70932)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java	2008-03-17 21:56:25 UTC (rev 70933)
@@ -35,6 +35,7 @@
 import javax.ejb.EJBLocalHome;
 import javax.ejb.TimerService;
 import javax.ejb.TransactionManagementType;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
@@ -90,8 +91,13 @@
       return rm;
    }
 
+   /**
+    * 
+    */
    public Object lookup(String name)
    {
+      if(name == null)
+         throw new IllegalArgumentException("name is null");
       String newName;
       if (name.startsWith("/"))
       {
@@ -105,18 +111,25 @@
       {
          return getContainer().getEnc().lookup(newName);
       }
-      catch (NamingException ignored)
+      catch (NameNotFoundException ignored)
       {
          try 
          {
             return getContainer().getInitialContext().lookup(name);
          } 
-         catch (NamingException ignored2)
+         catch (NameNotFoundException ignored2)
          {
-            
+            throw new IllegalArgumentException("Unable to find an entry in java:comp/env (or global JNDI) for '" + name + "'");
          }
+         catch(NamingException e)
+         {
+            throw new RuntimeException(e);
+         }
       }
-      return null;
+      catch(NamingException e)
+      {
+         throw new RuntimeException(e);
+      }
    }
 
    @SuppressWarnings("deprecation")