[jboss-cvs] JBossAS SVN: r62257 - trunk/ejb3/src/main/org/jboss/ejb3/stateless.

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

Author: thomas.diesler at jboss.com
Date: 2007-04-11 11:35:12 -0400 (Wed, 11 Apr 2007)
New Revision: 62257

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
Log:
[EJBTHREE-933] NPE when deploying web service beans

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-04-11 15:08:55 UTC (rev 62256)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-04-11 15:35:12 UTC (rev 62257)
@@ -21,13 +21,14 @@
  */
 package org.jboss.ejb3.stateless;
 
-import java.lang.reflect.InvocationTargetException;
 import javax.ejb.LocalHome;
+
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.JBossProxy;
 import org.jboss.ejb3.NonSerializableFactory;
 import org.jboss.ejb3.ProxyFactoryHelper;
+import org.jboss.logging.Logger;
 
 
 /**
@@ -38,33 +39,42 @@
  */
 public class StatelessLocalProxyFactory extends BaseStatelessProxyFactory
 {
+   private static final Logger log = Logger.getLogger(StatelessLocalProxyFactory.class);
+   
    protected Class[] getInterfaces()
    {
       Class[] interfaces;
-      
-      EJBContainer statelessContainer = (EJBContainer) container;
-      LocalHome localHome = (LocalHome) statelessContainer.resolveAnnotation(LocalHome.class);
-      
+
+      EJBContainer statelessContainer = (EJBContainer)container;
+      LocalHome localHome = (LocalHome)statelessContainer.resolveAnnotation(LocalHome.class);
+
       boolean bindTogether = false;
-      
+
       if (localHome != null && bindHomeAndBusinessTogether(statelessContainer))
          bindTogether = true;
-      
+
       Class[] localInterfaces = ProxyFactoryHelper.getLocalInterfaces(container);
-      
-      if (bindTogether)
-         interfaces = new Class[localInterfaces.length + 3];
+
+      if (localInterfaces != null)
+      {
+         if (bindTogether)
+            interfaces = new Class[localInterfaces.length + 3];
+         else 
+            interfaces = new Class[localInterfaces.length + 2];
+
+         System.arraycopy(localInterfaces, 0, interfaces, 0, localInterfaces.length);
+         interfaces[localInterfaces.length] = JBossProxy.class;
+         interfaces[localInterfaces.length + 1] = javax.ejb.EJBLocalObject.class;
+         if (bindTogether)
+            interfaces[localInterfaces.length + 2] = localHome.value();
+      }
       else
-         interfaces = new Class[localInterfaces.length + 2];
+      {
+         log.warn("[EJBTHREE-933] NPE when deploying web service beans");
+         interfaces = new Class[] {};
+      }
 
-      System.arraycopy(localInterfaces, 0, interfaces, 0, localInterfaces.length);
-      interfaces[localInterfaces.length] = JBossProxy.class;
-      interfaces[localInterfaces.length + 1] = javax.ejb.EJBLocalObject.class;
-      if (bindTogether)
-         interfaces[localInterfaces.length + 2] = localHome.value();
-
       return interfaces;
-
    }
    
    protected boolean bindHomeAndBusinessTogether(EJBContainer container)

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-04-11 15:08:55 UTC (rev 62256)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-04-11 15:35:12 UTC (rev 62257)
@@ -85,7 +85,7 @@
       }
       else
       {
-         log.warn("[EJBTHREE-933] No remote interfaces available");
+         log.warn("[EJBTHREE-933] NPE when deploying web service beans");
          interfaces = new Class[] {};
       }