Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7574: fix NPE due to missing body with json content type 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1684458 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2015-06-09 15:48:16 +00:00
parent 2abf02438b
commit 645eb35740
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -174,6 +174,9 @@ Bug Fixes
* SOLR-7518: New Facet Module should respect shards.tolerant and process all non-failing shards * SOLR-7518: New Facet Module should respect shards.tolerant and process all non-failing shards
instead of throwing an exception. (yonik) instead of throwing an exception. (yonik)
* SOLR-7574: A request with a json content type but no body caused a null pointer exception (yonik)
Other Changes Other Changes
---------------------- ----------------------

5
solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
View File

@ -76,7 +76,9 @@ public class RequestUtil {
try { try {
String jsonString = IOUtils.toString( cs.getReader() ); String jsonString = IOUtils.toString( cs.getReader() );
if (jsonString != null) {
MultiMapSolrParams.addParam(JSON, jsonString, map); MultiMapSolrParams.addParam(JSON, jsonString, map);
}
} catch (IOException e) { } catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Exception reading content stream for request:"+req, e); throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Exception reading content stream for request:"+req, e);
} }
@ -257,8 +259,11 @@ public class RequestUtil {
path = path.subList(1, path.size()); path = path.subList(1, path.size());
for (String jsonStr : vals) { for (String jsonStr : vals) {
Object o = ObjectBuilder.fromJSON(jsonStr); Object o = ObjectBuilder.fromJSON(jsonStr);
// zero-length strings or comments can cause this to be null (and a zero-length string can result from a json content-type w/o a body)
if (o != null) {
ObjectUtil.mergeObjects(json, path, o, handler); ObjectUtil.mergeObjects(json, path, o, handler);
} }
}
} catch (IOException e) { } catch (IOException e) {
// impossible // impossible
} }

15
solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
View File

@ -89,6 +89,16 @@ public class TestJsonRequest extends SolrTestCaseHS {
, "response/numFound==1" , "response/numFound==1"
); );
// test multiple json params with one being zero length
client.testJQ( params("json","{query:'cat_s:A'}", "json","{filter:'where_s:NY'}", "json","")
, "response/numFound==1"
);
// test multiple json params with one being a comment
client.testJQ( params("json","{query:'cat_s:A'}", "json","{filter:'where_s:NY'}", "json","/* */")
, "response/numFound==1"
);
// test merging multi-valued params into list // test merging multi-valued params into list
client.testJQ( params("json","{query:'*:*'}", "json","{filter:'where_s:NY'}", "json","{filter:'cat_s:A'}") client.testJQ( params("json","{query:'*:*'}", "json","{filter:'where_s:NY'}", "json","{filter:'cat_s:A'}")
, "response/numFound==1" , "response/numFound==1"
@ -114,6 +124,11 @@ public class TestJsonRequest extends SolrTestCaseHS {
, "response/numFound==1" , "response/numFound==1"
); );
// test inserting and merging with paths with an empty string and a comment
client.testJQ( params("json.query","'*:*'", "json.filter","'where_s:NY'", "json.filter","'cat_s:A'", "json.filter","", "json.filter","/* */")
, "response/numFound==1"
);
// test overwriting of non-multivalued params // test overwriting of non-multivalued params
client.testJQ( params("json.query","'foo_s:NONE'", "json.filter","'where_s:NY'", "json.filter","'cat_s:A'", "json.query","'*:*'") client.testJQ( params("json.query","'foo_s:NONE'", "json.filter","'where_s:NY'", "json.filter","'cat_s:A'", "json.query","'*:*'")
, "response/numFound==1" , "response/numFound==1"