You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/04/11 09:33:52 UTC
svn commit: r932844 -
/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java
Author: gerdogdu
Date: Sun Apr 11 07:33:51 2010
New Revision: 932844
URL: http://svn.apache.org/viewvc?rev=932844&view=rev
Log:
[OWB-348] Adding Interceptor and Decorator Support for EJB Beans
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java
Modified: openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java?rev=932844&r1=932843&r2=932844&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java (original)
+++ openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/component/OpenEjbBean.java Sun Apr 11 07:33:51 2010
@@ -75,34 +75,33 @@ public class OpenEjbBean<T> extends Base
@SuppressWarnings("unchecked")
protected T getInstance(CreationalContext<T> creationalContext)
{
- if(this.instance == null)
+ T instance = null;
+
+ ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+ Context jndiContext = containerSystem.getJNDIContext();
+ DeploymentInfo deploymentInfo = this.getDeploymentInfo();
+ try
{
- ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- Context jndiContext = containerSystem.getJNDIContext();
- DeploymentInfo deploymentInfo = this.getDeploymentInfo();
- try
+ if(iface != null)
{
- if(iface != null)
- {
- InterfaceType type = deploymentInfo.getInterfaceType(iface);
- if(!type.equals(InterfaceType.BUSINESS_LOCAL))
- {
- throw new IllegalArgumentException("Interface type is not legal business local interface for session bean class : " + getReturnType().getName());
- }
- }
- else
+ InterfaceType type = deploymentInfo.getInterfaceType(iface);
+ if(!type.equals(InterfaceType.BUSINESS_LOCAL))
{
- iface = this.deploymentInfo.getBusinessLocalInterface();
- }
-
- String jndiName = "java:openejb/Deployment/" + JndiBuilder.format(deploymentInfo.getDeploymentID(), this.iface.getName());
- this.instance = (T)this.iface.cast(jndiContext.lookup(jndiName));
-
- }catch(NamingException e)
+ throw new IllegalArgumentException("Interface type is not legal business local interface for session bean class : " + getReturnType().getName());
+ }
+ }
+ else
{
- throw new RuntimeException(e);
- }
- }
+ iface = this.deploymentInfo.getBusinessLocalInterface();
+ }
+
+ String jndiName = "java:openejb/Deployment/" + JndiBuilder.format(deploymentInfo.getDeploymentID(), this.iface.getName());
+ instance = (T)this.iface.cast(jndiContext.lookup(jndiName));
+
+ }catch(NamingException e)
+ {
+ throw new RuntimeException(e);
+ }
return instance;
}