lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject svn commit: r1617968 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Date Thu, 14 Aug 2014 15:09:44 GMT
Author: anshum
Date: Thu Aug 14 15:09:43 2014
New Revision: 1617968

URL: http://svn.apache.org/r1617968
Log:
SOLR-6284: Fix NPE in OCP when non-existent sliceId is used for a deleteShard request. (This
closes #74)

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1617968&r1=1617967&r2=1617968&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Aug 14 15:09:43 2014
@@ -272,6 +272,9 @@ Bug Fixes
 * SOLR-6372: HdfsDirectoryFactory should use supplied Configuration for communicating with
secure kerberos.
   (Gregory Chanan via Mark Miller)
 
+* SOLR-6284: Fix NPE in OCP when non-existent sliceId is used for a
+  deleteShard request (Ramkumar Aiyengar via Anshum Gupta)
+
 Optimizations
 ---------------------
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1617968&r1=1617967&r2=1617968&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
(original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Thu Aug 14 15:09:43 2014
@@ -1684,11 +1684,11 @@ public class OverseerCollectionProcessor
     if (slice == null) {
       if(clusterState.hasCollection(collection)) {
         throw new SolrException(ErrorCode.BAD_REQUEST,
-            "No shard with the specified name exists: " + slice.getName());
+            "No shard with name " + sliceId + " exists for collection " + collection);
       } else {
         throw new SolrException(ErrorCode.BAD_REQUEST,
             "No collection with the specified name exists: " + collection);
-      }      
+      }
     }
     // For now, only allow for deletions of Inactive slices or custom hashes (range==null).
     // TODO: Add check for range gaps on Slice deletion



Mime
View raw message