Author: struberg
Date: Tue May 19 12:54:31 2015
New Revision: 1680277
URL: http://svn.apache.org/r1680277
Log:
OWB-1035 fix ELResolver handling
Modified:
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
Modified:
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java?rev=1680277&r1=1680276&r2=1680277&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
(original)
+++
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
Tue May 19 12:54:31 2015
@@ -124,7 +124,7 @@ public class WebBeansELResolver extends
if(beans != null && !beans.isEmpty())
{
//Managed bean
- Bean<Object> bean = (Bean<Object>)beans.iterator().next();
+ Bean<?> bean = beanManager.resolve(beans);
if(bean.getScope().equals(Dependent.class))
{
@@ -139,9 +139,9 @@ public class WebBeansELResolver extends
return contextualInstance;
}
- protected Object getNormalScopedContextualInstance(BeanManagerImpl
manager, ELContextStore store, ELContext context, Bean<Object> bean, String
beanName)
+ protected Object getNormalScopedContextualInstance(BeanManagerImpl
manager, ELContextStore store, ELContext context, Bean<?> bean, String beanName)
{
- CreationalContext<Object> creationalContext =
manager.createCreationalContext(bean);
+ CreationalContext<?> creationalContext =
manager.createCreationalContext(bean);
Object contextualInstance = manager.getReference(bean, Object.class,
creationalContext);
if (contextualInstance != null)
{
@@ -154,7 +154,7 @@ public class WebBeansELResolver extends
}
- protected Object getDependentContextualInstance(BeanManagerImpl manager,
ELContextStore store, ELContext context, Bean<Object> bean)
+ protected Object getDependentContextualInstance(BeanManagerImpl manager,
ELContextStore store, ELContext context, Bean<?> bean)
{
Object contextualInstance = store.getDependent(bean);
if(contextualInstance != null)
@@ -165,7 +165,7 @@ public class WebBeansELResolver extends
else
{
// If no contextualInstance found on the store
- CreationalContext<Object> creationalContext =
manager.createCreationalContext(bean);
+ CreationalContext<?> creationalContext =
manager.createCreationalContext(bean);
contextualInstance = manager.getReference(bean, bestType(bean),
creationalContext);
if (contextualInstance != null)
{
