You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/05/03 15:03:26 UTC

svn commit: r1592196 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java

Author: shalin
Date: Sat May  3 13:03:25 2014
New Revision: 1592196

URL: http://svn.apache.org/r1592196
Log:
SOLR-6023: FieldAnalysisRequestHandler throws NPE if no parameters are supplied

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    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)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1592196&r1=1592195&r2=1592196&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat May  3 13:03:25 2014
@@ -70,6 +70,9 @@ Bug Fixes
 * SOLR-6037: Fixed incorrect max/sum/stddev for Date fields in StatsComponent
   (Brett Lucey, hossman)
 
+* SOLR-6023: FieldAnalysisRequestHandler throws NPE if no parameters are supplied.
+  (shalin)
+
 Other Changes
 ---------------------
 

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java?rev=1592196&r1=1592195&r2=1592196&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java Sat May  3 13:03:25 2014
@@ -139,7 +139,7 @@ public class FieldAnalysisRequestHandler
     }
     analysisRequest.setQuery(solrParams.get(AnalysisParams.QUERY, solrParams.get(CommonParams.Q)));
 
-    String value = solrParams.get(AnalysisParams.FIELD_VALUE);
+    String value = solrParams.required().get(AnalysisParams.FIELD_VALUE);
 
     Iterable<ContentStream> streams = req.getContentStreams();
     if (streams != null) {

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java?rev=1592196&r1=1592195&r2=1592196&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java Sat May  3 13:03:25 2014
@@ -19,6 +19,7 @@ package org.apache.solr.handler;
 
 import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.AnalysisParams;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -379,5 +380,20 @@ public class FieldAnalysisRequestHandler
     assertToken(tokenList.get(4), new TokenInfo("a", null, "word", 12, 13, 4, new int[]{3,4,4}, null, false));
     assertToken(tokenList.get(5), new TokenInfo("test", null, "word", 14, 18, 5, new int[]{4,5,5}, null, false));
   }
-  
+
+  public void testRequiredParamHandling() throws Exception {
+    ModifiableSolrParams params = new ModifiableSolrParams();
+    params.add(CommonParams.Q, "fox brown");
+
+    SolrQueryRequest req = new LocalSolrQueryRequest(h.getCore(), params);
+    try {
+      FieldAnalysisRequest request = handler.resolveAnalysisRequest(req);
+      fail("A request with no parameters should not have succeeded");
+    } catch (NullPointerException npe) {
+      fail("A request with no paramters should not result in NPE");
+    } catch (SolrException e) {
+      assertEquals("A request with no parameters should have returned a BAD_REQUEST error", e.code(),
+          SolrException.ErrorCode.BAD_REQUEST.code);
+    }
+  }
 }