You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2015/02/12 12:22:21 UTC
svn commit: r1659225 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/suggest/
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
solr/ solr/CHANGES.txt
Author: janhoy
Date: Thu Feb 12 11:22:20 2015
New Revision: 1659225
URL: http://svn.apache.org/r1659225
Log:
SOLR-7084: FreeTextSuggester Nullpointer when building dictionary (merge from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1659225&r1=1659224&r2=1659225&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Thu Feb 12 11:22:20 2015
@@ -469,6 +469,9 @@ public class FreeTextSuggester extends L
if (contexts != null) {
throw new IllegalArgumentException("this suggester doesn't support contexts");
}
+ if (fst == null) {
+ throw new IllegalStateException("Lookup not supported at this time");
+ }
try (TokenStream ts = queryAnalyzer.tokenStream("", key.toString())) {
TermToBytesRefAttribute termBytesAtt = ts.addAttribute(TermToBytesRefAttribute.class);
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1659225&r1=1659224&r2=1659225&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Feb 12 11:22:20 2015
@@ -83,6 +83,9 @@ Bug Fixes
* SOLR-6214: Snapshots numberToKeep param only keeps n-1 backups.
(Mathias H., Ramana, Varun Thacker via shalin)
+* SOLR-7084: FreeTextSuggester: Better error message when doing a lookup
+ during dictionary build. Used to be nullpointer (janhoy)
+
Optimizations
----------------------
* SOLR-7049: Move work done by the LIST Collections API call to the Collections