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

SOLR-7529: CoreAdminHandler Reload throws NPE on null core name instead of a bad request error 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1690426 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2015-07-12 05:36:05 +00:00
parent 2c64848c78
commit 07a615fd65
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -227,6 +227,9 @@ Bug Fixes
* SOLR-7705: CoreAdminHandler Unload no longer handles null core name and throws NPE
instead of a bad request error. (John Call, Edward Ribeiro via shalin)
* SOLR-7529: CoreAdminHandler Reload throws NPE on null core name instead of a bad
request error. (Jellyfrog, Edward Ribeiro via shalin)
Optimizations
----------------------

2
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
View File

@ -766,7 +766,7 @@ public class CoreAdminHandler extends RequestHandlerBase {
SolrParams params = req.getParams();
String cname = params.get(CoreAdminParams.CORE);
if(!coreContainer.getCoreNames().contains(cname)) {
if (cname == null || !coreContainer.getCoreNames().contains(cname)) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Core with core name [" + cname + "] does not exist.");
}

16
solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
View File

@ -243,5 +243,21 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
} catch (Exception e) {
assertEquals("Expected error message for non-existent core.", "Core with core name [non-existent-core] does not exist.", e.getMessage());
}
// test null core
try {
admin.handleRequestBody(
req(CoreAdminParams.ACTION,
CoreAdminParams.CoreAdminAction.RELOAD.toString())
, resp);
fail("Was able to successfully reload null core");
}
catch (Exception e) {
if (!(e instanceof SolrException)) {
fail("Expected SolrException but got " + e);
}
assertEquals("Expected error message for non-existent core.", "Core with core name [null] does not exist.", e.getMessage());
}
}
}