You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2015/04/13 23:12:39 UTC
svn commit: r1673283 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
Author: dsmiley
Date: Mon Apr 13 21:12:39 2015
New Revision: 1673283
URL: http://svn.apache.org/r1673283
Log:
SOLR-6692: Highlighter NPE bugfix when highlight nonexistent field.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1673283&r1=1673282&r2=1673283&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Mon Apr 13 21:12:39 2015
@@ -237,7 +237,7 @@ public class DefaultSolrHighlighter exte
* @param params The params controlling Highlighting
*/
protected int getMaxSnippets(String fieldName, SolrParams params) {
- return params.getFieldInt(fieldName, HighlightParams.SNIPPETS,1);
+ return params.getFieldInt(fieldName, HighlightParams.SNIPPETS, 1);
}
/**
@@ -298,7 +298,7 @@ public class DefaultSolrHighlighter exte
protected Fragmenter getFragmenter(String fieldName, SolrParams params)
{
String fmt = params.getFieldParam( fieldName, HighlightParams.FRAGMENTER );
- SolrFragmenter frag = fragmenters.get( fmt );
+ SolrFragmenter frag = fragmenters.get(fmt);
if( frag == null ) {
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST, "Unknown fragmenter: "+fmt );
}
@@ -450,7 +450,7 @@ public class DefaultSolrHighlighter exte
final int mvToExamine =
req.getParams().getFieldInt(fieldName, HighlightParams.MAX_MULTIVALUED_TO_EXAMINE,
- schemaField.multiValued() ? Integer.MAX_VALUE : 1);
+ (schemaField != null && schemaField.multiValued()) ? Integer.MAX_VALUE : 1);
// Technically this is the max *fragments* (snippets), not max values:
int mvToMatch =
req.getParams().getFieldInt(fieldName, HighlightParams.MAX_MULTIVALUED_TO_MATCH, Integer.MAX_VALUE);