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 2015/07/12 07:36:06 UTC
svn commit: r1690426 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
Author: shalin
Date: Sun Jul 12 05:36:05 2015
New Revision: 1690426
URL: http://svn.apache.org/r1690426
Log:
SOLR-7529: CoreAdminHandler Reload throws NPE on null core name instead of a bad request error
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1690426&r1=1690425&r2=1690426&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Jul 12 05:36:05 2015
@@ -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
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1690426&r1=1690425&r2=1690426&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sun Jul 12 05:36:05 2015
@@ -766,7 +766,7 @@ public class CoreAdminHandler extends Re
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.");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?rev=1690426&r1=1690425&r2=1690426&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Sun Jul 12 05:36:05 2015
@@ -243,5 +243,21 @@ public class CoreAdminHandlerTest extend
} 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());
+ }
+
}
}