Oops, remove uncessary holder structure

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2942 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jul 1, 2009 · c13680d · c13680d
1 parent f41beb6
commit c13680d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
@@ -216,7 +216,8 @@ public String toString()
    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

diff --git a/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java b/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java
@@ -129,26 +129,26 @@ else if (base instanceof Namespace)
          {
             name = propertyString;
          }
-         final ValueHolder<Object> holder = new ValueHolder<Object>();
+         Object value = null;
          try
          {
 
             Bean<?> bean = manager.resolve(manager.getBeans(name));
             CreationalContext<?> creationalContext = manager.createCreationalContext(bean);
             if (bean != null)
             {
-               holder.setValue(manager.getReference(bean, creationalContext));
+               value = manager.getReference(bean, creationalContext);
             }
             creationalContext.release();
          }
          catch (Exception e)
          {
             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;