[gatein-commits] gatein SVN: r7531 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.
Author: chris.laprun(a)jboss.com
Date: 2011-09-27 11:17:24 -0400 (Tue, 27 Sep 2011)
New Revision: 7531
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java
Log:
- Make findBean look into session before attempting to resolve the bean from an EL
expression.
- Use findBean to resolve manager in ConsumerBean.
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-27
14:58:41 UTC (rev 7530)
+++
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-27
15:17:24 UTC (rev 7531)
@@ -260,8 +260,7 @@
* @param <T> type of the object to be retrieved
* @return the session object associated with the specified name
* @throws IllegalArgumentException if the value associated with the specified name is
not <code>null</code> and
- * does
- * not match the specified expected class
+ * does not match the specified expected class
*/
public <T> T getFromSession(String name, Class<T> expectedClass)
{
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-09-27
14:58:41 UTC (rev 7530)
+++
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-09-27
15:17:24 UTC (rev 7531)
@@ -777,7 +777,7 @@
{
if (manager == null)
{
- manager = beanContext.getFromSession("consumersMgr",
ConsumerManagerBean.class);
+ manager = beanContext.findBean("consumersMgr",
ConsumerManagerBean.class);
}
return manager;
}
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java
===================================================================
---
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java 2011-09-27
14:58:41 UTC (rev 7530)
+++
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/JSFBeanContext.java 2011-09-27
15:17:24 UTC (rev 7531)
@@ -70,8 +70,14 @@
if (candidate == null)
{
- // try to get the bean from an EL expression
- candidate = facesContext.getApplication().evaluateExpressionGet(facesContext,
"#{" + name + "}", type);
+ // try the session map
+ candidate = getFromSession(name, type);
+
+ if (candidate == null)
+ {
+ // try to get the bean from an EL expression
+ candidate = facesContext.getApplication().evaluateExpressionGet(facesContext,
"#{" + name + "}", type);
+ }
}
if (candidate != null)