svn commit: r1301946 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: container/BeanManagerImpl.java context/ContextFactory.java

[struberg]

Author: struberg
Date: Sat Mar 17 15:14:47 2012
New Revision: 1301946

URL: http://svn.apache.org/viewvc?rev=1301946&view=rev
Log:
OWB-650 rollback. Guess the Cache FOR the proxies got confused with the Caches 
IN the proxies.

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.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=1301946&r1=1301945&r2=1301946&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
 Sat Mar 17 15:14:47 2012
@@ -1252,8 +1252,4 @@ public class BeanManagerImpl implements 
         return inUse;
     }
 
-    public void resetProxyCache()
-    {
-        this.cacheProxies.clear();
-    }
 }

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=1301946&r1=1301945&r2=1301946&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
 Sat Mar 17 15:14:47 2012
@@ -89,7 +89,6 @@ public final class ContextFactory
     {
         ContextsService contextService = getContextsService();
         contextService.endContext(RequestScoped.class, request);
-        resetProxyCache();
     }
 
     public void initSessionContext(Object session)
@@ -109,7 +108,6 @@ public final class ContextFactory
     {
         ContextsService contextService = getContextsService();
         contextService.endContext(SessionScoped.class, session);
-        resetProxyCache();
     }
 
     public void initApplicationContext(Object parameter)
@@ -135,7 +133,6 @@ public final class ContextFactory
     {
         ContextsService contextService = getContextsService();
         contextService.endContext(ApplicationScoped.class, parameter);
-        resetProxyCache();
     }
 
     public void initSingletonContext(Object parameter)
@@ -155,7 +152,6 @@ public final class ContextFactory
     {
         ContextsService contextService = getContextsService();
         contextService.endContext(Singleton.class, parameter);
-        resetProxyCache();
     }
 
     public void initConversationContext(Object context)
@@ -175,7 +171,6 @@ public final class ContextFactory
     {
         ContextsService contextService = getContextsService();
         contextService.endContext(ConversationScoped.class, null);
-        resetProxyCache();
     }
 
     /**
@@ -258,8 +253,4 @@ public final class ContextFactory
     }
 
 
-    private void resetProxyCache()
-    {
-        this.webBeansContext.getBeanManagerImpl().resetProxyCache();
-    }
 }