You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by sh...@apache.org on 2015/10/24 18:58:56 UTC

svn commit: r1710366 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java

Author: shalin
Date: Sat Oct 24 16:58:56 2015
New Revision: 1710366

URL: http://svn.apache.org/viewvc?rev=1710366&view=rev
Log:
SOLR-8189: Use WeakIdentityMap.newConcurrentHashMap instead of a synchronized WeakHashMap for better concurrency

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1710366&r1=1710365&r2=1710366&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Sat Oct 24 16:58:56 2015
@@ -27,6 +27,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.lucene.util.WeakIdentityMap;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.apache.solr.core.IndexDeletionPolicyWrapper;
 import org.apache.solr.core.SolrCore;
@@ -56,7 +57,7 @@ public final class HttpCacheHeaderUtil {
    *
    * @see #calcEtag
    */
-  private static Map<SolrCore, EtagCacheVal> etagCoreCache = Collections.synchronizedMap(new WeakHashMap<>());
+  private static WeakIdentityMap<SolrCore, EtagCacheVal> etagCoreCache = WeakIdentityMap.newConcurrentHashMap();
 
   /** @see #etagCoreCache */
   private static class EtagCacheVal {