You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2015/05/15 20:41:24 UTC

svn commit: r1679619 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java

Author: jbernste
Date: Fri May 15 18:41:23 2015
New Revision: 1679619

URL: http://svn.apache.org/r1679619
Log:
SOLR-7472: SortingResponseWriter does not log fl parameters that don't exist.

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1679619&r1=1679618&r2=1679619&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri May 15 18:41:23 2015
@@ -214,6 +214,8 @@ Bug Fixes
 * SOLR-7542: Schema API: Can't remove single dynamic copy field directive
   (Steve Rowe)
 
+* SOLR-7472: SortingResponseWriter does not log fl parameters that don't exist. (Joel Bernstein)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java?rev=1679619&r1=1679618&r2=1679619&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java Fri May 15 18:41:23 2015
@@ -229,7 +229,13 @@ public class SortingResponseWriter imple
     FieldWriter[] writers = new FieldWriter[fields.length];
     for(int i=0; i<fields.length; i++) {
       String field = fields[i];
-      SchemaField schemaField = schema.getField(field);
+      SchemaField schemaField = null;
+
+      try {
+        schemaField = schema.getField(field);
+      } catch (Exception e) {
+        throw new IOException(e);
+      }
 
       if(!schemaField.hasDocValues()) {
         throw new IOException(field+" must have DocValues to use this feature.");