openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r926661 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context: ApplicationContext.java ConversationContext.java RequestContext.java SessionContext.java SingletonContext.java WebBeansContext.java
Date Tue, 23 Mar 2010 16:58:43 GMT
Author: struberg
Date: Tue Mar 23 16:58:42 2010
New Revision: 926661

URL: http://svn.apache.org/viewvc?rev=926661&view=rev
Log:
OWB-329 rollback WeakHashMap change

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
Tue Mar 23 16:58:42 2010
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.context;
 
-import java.util.Collections;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.spi.Contextual;
 
@@ -34,7 +33,7 @@ public class ApplicationContext extends 
     @Override
     public void setComponentInstanceMap()
     {
-        this.componentInstanceMap = Collections.synchronizedMap(new WeakHashMap<Contextual<?>,
Object>());
+        this.componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>();
 
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
Tue Mar 23 16:58:42 2010
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.context;
 
-import java.util.Collections;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.spi.Contextual;
 
@@ -36,7 +35,7 @@ public class ConversationContext extends
     @Override
     public void setComponentInstanceMap()
     {
-        this.componentInstanceMap = Collections.synchronizedMap(new WeakHashMap<Contextual<?>,
Object>());
+        this.componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>();
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
Tue Mar 23 16:58:42 2010
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.context;
 
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.spi.Contextual;
 
@@ -38,7 +38,7 @@ public class RequestContext extends Abst
     @Override
     public void setComponentInstanceMap()
     {
-        this.componentInstanceMap = new WeakHashMap<Contextual<?>, Object>();
+        this.componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>();
 
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
Tue Mar 23 16:58:42 2010
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.context;
 
-import java.util.Collections;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.spi.Contextual;
 
@@ -33,7 +32,7 @@ public class SessionContext extends Abst
     @Override
     public void setComponentInstanceMap()
     {
-        this.componentInstanceMap = Collections.synchronizedMap(new WeakHashMap<Contextual<?>,
Object>());
+        this.componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>();
 
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
Tue Mar 23 16:58:42 2010
@@ -13,8 +13,7 @@
  */
 package org.apache.webbeans.context;
 
-import java.util.Collections;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.spi.Contextual;
 
@@ -34,6 +33,6 @@ public class SingletonContext extends Ab
     @Override
     public void setComponentInstanceMap()
     {
-        this.componentInstanceMap = Collections.synchronizedMap(new WeakHashMap<Contextual<?>,
Object>());
+        this.componentInstanceMap = new ConcurrentHashMap<Contextual<?>, Object>();
     }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java?rev=926661&r1=926660&r2=926661&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
Tue Mar 23 16:58:42 2010
@@ -51,6 +51,8 @@ public interface WebBeansContext extends
      * @param <T> type info
      * @param contextual contextual 
      * @return creational context info for given contextual
+     * 
+     * @deprecated A context must not rely on this information!
      */
     public <T> CreationalContext<T> getCreationalContext(Contextual<T>
contextual);
         



Mime
View raw message