You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/01 14:33:27 UTC
svn commit: r1427400 - in /lucene/dev/branches/branch_4x: ./
lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/ solr/
solr/core/ solr/core/src/test-files/solr/collection1/conf/
solr/core/src/test/org/apache/solr/schema/
Author: rmuir
Date: Tue Jan 1 13:33:26 2013
New Revision: 1427400
URL: http://svn.apache.org/viewvc?rev=1427400&view=rev
Log:
SOLR-4251: Fix SynonymFilterFactory when an optional tokenizerFactory is supplied
Added:
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
- copied unchanged from r1427399, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java
- copied unchanged from r1427399, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java?rev=1427400&r1=1427399&r2=1427400&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java Tue Jan 1 13:33:26 2013
@@ -56,6 +56,7 @@ public class SynonymFilterFactory extend
}
delegator = new SlowSynonymFilterFactory();
}
+ delegator.setLuceneMatchVersion(luceneMatchVersion);
delegator.init(args);
}
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1427400&r1=1427399&r2=1427400&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Jan 1 13:33:26 2013
@@ -400,6 +400,9 @@ Bug Fixes
* SOLR-4238: Fix jetty example requestLog config (jm via hossman)
+* SOLR-4251: Fix SynonymFilterFactory when an optional tokenizerFactory is supplied.
+ (Chris Bleakley via rmuir)
+
Other Changes
----------------------