You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/07/08 21:39:42 UTC
svn commit: r1500903 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/component/QueryComponent.java
Author: yonik
Date: Mon Jul 8 19:39:42 2013
New Revision: 1500903
URL: http://svn.apache.org/r1500903
Log:
SOLR-5019: don't modify original filter list
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1500903&r1=1500902&r2=1500903&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Jul 8 19:39:42 2013
@@ -265,6 +265,10 @@ Bug Fixes
* SOLR-4978: Time is stripped from datetime column when imported into Solr date field
if convertType=true. (Bill Au, shalin)
+* SOLR-5019: spurious ConcurrentModificationException when spell check component
+ was in use with filters. (yonik)
+
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1500903&r1=1500902&r2=1500903&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Mon Jul 8 19:39:42 2013
@@ -152,9 +152,8 @@ public class QueryComponent extends Sear
String[] fqs = req.getParams().getParams(CommonParams.FQ);
if (fqs!=null && fqs.length!=0) {
List<Query> filters = rb.getFilters();
- if (filters==null) {
- filters = new ArrayList<Query>(fqs.length);
- }
+ // if filters already exists, make a copy instead of modifying the original
+ filters = filters == null ? new ArrayList<Query>(fqs.length) : new ArrayList<Query>(filters);
for (String fq : fqs) {
if (fq != null && fq.trim().length()!=0) {
QParser fqp = QParser.getParser(fq, null, req);