Author: djencks
Date: Fri Nov 12 01:35:45 2010
New Revision: 1034239
URL: http://svn.apache.org/viewvc?rev=1034239&view=rev
Log:
OWB-486 fix infinite loop introduced in previous change rev 1030843
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1034239&r1=1034238&r2=1034239&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
Fri Nov 12 01:35:45 2010
@@ -48,26 +48,25 @@ public class ResourceBean<X, T extends A
@SuppressWarnings("unchecked")
protected X createInstance(CreationalContext<X> creationalContext)
{
- X instance = null;
try
{
ResourceInjectionService resourceService =
ServiceLoader.getService(ResourceInjectionService.class);
- instance =
resourceService.getResourceReference(this.resourceReference);
+ X instance =
resourceService.getResourceReference(this.resourceReference);
if (instance != null &&
Modifier.isFinal(instance.getClass().getModifiers()))
{
return instance;
}
- instance = (X)
JavassistProxyFactory.getInstance().getResourceBeanProxyClass(this).newInstance();
- ((ProxyObject) instance).setHandler(new
ResourceProxyHandler(this,instance));
+ X proxyInstance = (X)
JavassistProxyFactory.getInstance().getResourceBeanProxyClass(this).newInstance();
+ ((ProxyObject) proxyInstance).setHandler(new
ResourceProxyHandler(this,instance));
+ return proxyInstance;
}
catch (Exception e)
{
throw new WebBeansException(e);
}
- return instance;
}
/**
