svn commit: r961917 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

[st...@apache.org]

Author: struberg
Date: Thu Jul  8 20:26:15 2010
New Revision: 961917

URL: http://svn.apache.org/viewvc?rev=961917&view=rev
Log:
OWB-404 make drop static contextMap.

contextMap must not be static, because this mixes up contexts
in shared classloader environments like in EE servers.

I also removed the obsolete parent BeanManager stuff.

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=961917&r1=961916&r2=961917&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Thu Jul  8 20:26:15 2010
@@ -108,7 +108,7 @@ public class BeanManagerImpl implements 
     private static final long serialVersionUID = 1L;
 
     /**Holds the context with key scope*/
-    private static Map<Class<? extends Annotation>, List<Context>> contextMap = new ConcurrentHashMap<Class<? extends Annotation>, List<Context>>();
+    private Map<Class<? extends Annotation>, List<Context>> contextMap = new ConcurrentHashMap<Class<? extends Annotation>, List<Context>>();
 
     /**Deployment archive beans*/
     private Set<Bean<?>> deploymentBeans = new CopyOnWriteArraySet<Bean<?>>();
@@ -167,11 +167,6 @@ public class BeanManagerImpl implements 
         new ConcurrentHashMap<Class<?>, InjectionTargetWrapper<?>>();
 
     /**
-     * The parent Manager this child is depending from.
-     */
-    private BeanManagerImpl parent;
-    
-    /**
      * Creates a new {@link BeanManager} instance.
      * Called by the system. Do not use outside of the
      * system.
@@ -214,18 +209,7 @@ public class BeanManagerImpl implements 
     {
         return this.errorStack;
     }
-    
-    public BeanManagerImpl getParent()
-    {
-        return this.parent;
-    }
-    
-    public synchronized void setParent(BeanManagerImpl parent)
-    {
-       this.parent = parent;
-    }
-    
-    
+
     /**
      * Return manager notification manager.
      * 
@@ -300,7 +284,7 @@ public class BeanManagerImpl implements 
             }
         }
         
-        List<Context> others = BeanManagerImpl.contextMap.get(scopeType);
+        List<Context> others = contextMap.get(scopeType);
         if(others != null)
         {
             for(Context otherContext : others)
@@ -612,14 +596,14 @@ public class BeanManagerImpl implements 
         Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
         Asserts.assertNotNull(context, "context parameter can not be null");
 
-        List<Context> contextList = BeanManagerImpl.contextMap.get(scopeType);
+        List<Context> contextList = contextMap.get(scopeType);
         
         if(contextList == null)
         {
             contextList = new CopyOnWriteArrayList<Context>();
             contextList.add(context);
             
-            BeanManagerImpl.contextMap.put(scopeType, contextList);
+            contextMap.put(scopeType, contextList);
         }
         else
         {