Minor. WS and comments.

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@207 1c488680-804c-0410-94cd-c6b725194a0e
weld · Oct 29, 2008 · b3b133c · b3b133c
1 parent d228da0
commit b3b133c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 55 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ClientProxy.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ClientProxy.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -294,7 +294,8 @@ public <T> T getInstance(Bean<T> bean)
          contextMap.getDependentContext().setActive(true);
          if (getModelManager().getScopeModel(bean.getScopeType()).isNormal())
          {
-            return (T) getClientProxy(bean);
+            // TODO What *really* to proxy? The bean? The instance?
+            return (T) getClientProxy(bean).create();
          }
          else
          {

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ProxyData.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ProxyData.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
@@ -8,13 +8,13 @@
 
 public abstract class NormalContext extends AbstractContext
 {
-
    private BeanMap beans;
 
    public NormalContext(Class<? extends Annotation> scopeType)
    {
       super(scopeType);
       beans = new BeanMap();
+      //TODO Are they active at creation?
       active = true;
    }
 
@@ -25,6 +25,7 @@ public <T> T get(Bean<T> bean, boolean create)
          throw new ContextNotActiveException();
       }
 
+      //TODO violation of specs. Why not just set active to false in destroy()?
       if (beans == null)
       {
          // Context has been destroyed

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/util/ClientProxyFactory.java b/webbeans-ri/src/main/java/org/jboss/webbeans/util/ClientProxyFactory.java
@@ -11,6 +11,9 @@
 import javax.webbeans.manager.Context;
 
 import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.test.beans.Tuna;
+import org.jboss.webbeans.test.mock.MockManagerImpl;
+import org.jboss.webbeans.test.util.Util;
 
 public class ClientProxyFactory
 {