[jboss-remoting-commits] JBoss Remoting SVN: r4012 - in remoting3/trunk: util/src/main/java/org/jboss/cx/remoting/util and 1 other directory.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-04-18 14:13:33 -0400 (Fri, 18 Apr 2008)
New Revision: 4012

Modified:
   remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java
   remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
Log:
Use regular concurrent hash map when no special key/value types are needed

Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java	2008-04-18 16:54:37 UTC (rev 4011)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java	2008-04-18 18:13:33 UTC (rev 4012)
@@ -97,8 +97,7 @@
 
     // Session management
 
-    // todo - weak value concurrent hash map
-    private final ConcurrentMap<String, RemotingHttpSession> sessionMap = CollectionUtil.concurrentMap();
+    private final ConcurrentMap<String, RemotingHttpSession> sessionMap = CollectionUtil.concurrentWeakValueMap();
 
     private String generateSessionId() {
         final byte[] bytes = new byte[32];

Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java	2008-04-18 16:54:37 UTC (rev 4011)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java	2008-04-18 18:13:33 UTC (rev 4012)
@@ -41,7 +41,7 @@
      * @return a new concurrent map
      */
     public static <K, V> ConcurrentMap<K, V> concurrentMap() {
-        return new ConcurrentReferenceHashMap<K, V>(16, STRONG, STRONG);
+        return new ConcurrentHashMap<K, V>();
     }
 
     /**