[webbeans-commits] Webbeans SVN: r2942 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: el and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-07-01 10:37:36 -0400 (Wed, 01 Jul 2009)
New Revision: 2942

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java
Log:
Oops, remove uncessary holder structure

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-07-01 14:36:02 UTC (rev 2941)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java	2009-07-01 14:37:36 UTC (rev 2942)
@@ -216,8 +216,9 @@
    private transient final Namespace rootNamespace;
    private transient final List<EventObserver<?>> observers;
    private transient final Set<BeanManagerImpl> childActivities;
-   private transient final Integer id;
    
+   private final Integer id;
+   
    /*
     * Runtime data transfer
     * *********************

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java	2009-07-01 14:36:02 UTC (rev 2941)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java	2009-07-01 14:37:36 UTC (rev 2942)
@@ -129,7 +129,7 @@
          {
             name = propertyString;
          }
-         final ValueHolder<Object> holder = new ValueHolder<Object>();
+         Object value = null;
          try
          {
             
@@ -137,7 +137,7 @@
             CreationalContext<?> creationalContext = manager.createCreationalContext(bean);
             if (bean != null)
             {
-               holder.setValue(manager.getReference(bean, creationalContext));
+               value = manager.getReference(bean, creationalContext);
             }
             creationalContext.release();
          }
@@ -145,10 +145,10 @@
          {
             throw new RuntimeException("Error resolving property " + propertyString + " against base " + base, e);
          }
-         if (holder.getValue() != null)
+         if (value != null)
          {
             context.setPropertyResolved(true);
-            return holder.getValue();
+            return value;
          }
       }
       return null;