Author: shalin
Date: Mon Jan 26 18:00:06 2009
New Revision: 737771
URL: http://svn.apache.org/viewvc?rev=737771&view=rev
Log:
SOLR-985 -- Fix thread-safety issue with TemplateString for concurrent imports
with multiple cores
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=737771&r1=737770&r2=737771&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Mon Jan 26 18:00:06
2009
@@ -94,6 +94,9 @@
12. SOLR-884: CachedSqlEntityProcessor should check if the cache key is
present in the query results
(Noble Paul via shalin)
+13. SOLR-985: Fix thread-safety issue with TemplateString for concurrent
imports with multiple cores.
+ (Ryuuichi Kumai via shalin)
+
Documentation
----------------------
Modified:
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java?rev=737771&r1=737770&r2=737771&view=diff
==============================================================================
---
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
(original)
+++
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
Mon Jan 26 18:00:06 2009
@@ -20,6 +20,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -43,7 +45,7 @@
private Map<String, TemplateString> cache;
public TemplateString() {
- cache = new HashMap<String, TemplateString>();
+ cache = new ConcurrentHashMap<String, TemplateString>();
}
private TemplateString(String s) {
