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

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

Author: scott.stark at jboss.org
Date: 2007-11-07 01:09:13 -0500 (Wed, 07 Nov 2007)
New Revision: 66808

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
Log:
Handle a missing JndiBindingPolicy annotation

Modified: trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-11-07 03:11:22 UTC (rev 66807)
+++ trunk/ejb3/src/main/org/jboss/ejb3/ProxyFactoryHelper.java	2007-11-07 06:09:13 UTC (rev 66808)
@@ -43,6 +43,7 @@
 import org.jboss.ejb.LocalImpl;
 import org.jboss.ejb.RemoteImpl;
 import org.jboss.ejb3.jndipolicy.DefaultJndiBindingPolicy;
+import org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy;
 import org.jboss.ejb3.remoting.RemoteProxyFactory;
 import org.jboss.ejb3.service.ServiceContainer;
 import org.jboss.ejb3.session.SessionContainer;
@@ -748,8 +749,13 @@
     */
    private static DefaultJndiBindingPolicy getJndiBindingPolicy(Container container)
    {
-      Class<? extends DefaultJndiBindingPolicy> policy = ((EJBContainer) container).getAnnotation(
-            JndiBindingPolicy.class).policy();
+      EJBContainer ejbContainer = (EJBContainer) container;
+      JndiBindingPolicy bindingPolicy = ejbContainer.getAnnotation(JndiBindingPolicy.class);
+      Class<? extends DefaultJndiBindingPolicy> policy = null;
+      if(bindingPolicy != null)
+         policy = bindingPolicy.policy();
+      else
+         policy = PackagingBasedJndiBindingPolicy.class;
       log.debug("Obtaining JNDI name from policy " + policy.getName());
       try
       {