[jboss-cvs] JBossAS SVN: r63182 - in trunk/ejb3/src/main/org/jboss/ejb3: stateful and 1 other directories.

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

Author: wolfc
Date: 2007-05-22 09:30:09 -0400 (Tue, 22 May 2007)
New Revision: 63182

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
   trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
Log:
EJBTHREE-972: check for null on getBusinessObject

Modified: trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2007-05-22 13:29:19 UTC (rev 63181)
+++ trunk/ejb3/src/main/org/jboss/ejb3/BaseSessionContext.java	2007-05-22 13:30:09 UTC (rev 63182)
@@ -357,6 +357,9 @@
 
    public Object getBusinessObject(Class businessInterface) throws IllegalStateException
    {
+      if(businessInterface == null)
+         throw new IllegalStateException("businessInterface is null");
+      
       return ((EJBContainer)container).getBusinessObject(baseContext, businessInterface); 
    }
    

Modified: trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-05-22 13:29:19 UTC (rev 63181)
+++ trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-05-22 13:30:09 UTC (rev 63182)
@@ -272,6 +272,9 @@
 
    public static String getJndiName(Container container, Class businessInterface)
    {
+      assert container != null : "container is null";
+      assert businessInterface != null : "businessInterface is null";
+      
       if (!(container instanceof SessionContainer)) return null;
       Advisor advisor = (Advisor) container;
       Class[] remotes = getRemoteInterfaces(container);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java	2007-05-22 13:29:19 UTC (rev 63181)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java	2007-05-22 13:30:09 UTC (rev 63182)
@@ -837,6 +837,9 @@
    @Override
    public Object getBusinessObject(BeanContext beanContext, Class businessInterface) throws IllegalStateException
    {
+      assert beanContext != null : "beanContext is null";
+      assert businessInterface != null : "businessInterface is null";
+      
       StatefulBeanContext ctx = (StatefulBeanContext) beanContext;
 
       boolean isRemote = false;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java	2007-05-22 13:29:19 UTC (rev 63181)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java	2007-05-22 13:30:09 UTC (rev 63182)
@@ -400,6 +400,8 @@
    @Override
    public Object getBusinessObject(BeanContext ctx, Class intf)
    {
+      assert intf != null : "intf is null";
+      
       try
       {
          String jndiName = ProxyFactoryHelper.getJndiName(this, intf);