SOLR-7934: SolrCLI masks underlying cause of create collection failure.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_5_3@1696059 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bd85068..5bfe4c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -238,6 +238,8 @@
* SOLR-7921: The techproducts example fails when running in a directory that contains spaces.
(Ishan Chattopadhyaya via Timothy Potter)
+* SOLR-7934: SolrCLI masks underlying cause of create collection failure. (Timothy Potter)
+
Optimizations
----------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 9f3b508..c608bc0 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -1446,13 +1446,7 @@
try {
json = getJson(createCollectionUrl);
} catch (SolrServerException sse) {
- // check if already exists
- if (safeCheckCollectionExists(collectionListUrl, collectionName)) {
- throw new IllegalArgumentException("Collection '"+collectionName+
- "' already exists!\nChecked collection existence using Collections API command:\n"+collectionListUrl);
- } else {
- throw new Exception("Failed to create collection '"+collectionName+"' due to: "+sse.getMessage());
- }
+ throw new Exception("Failed to create collection '"+collectionName+"' due to: "+sse.getMessage());
}
CharArr arr = new CharArr();
@@ -1584,18 +1578,7 @@
echo("\nCreating new core '" + coreName + "' using command:\n" + createCoreUrl + "\n");
- Map<String,Object> json = null;
- try {
- json = getJson(createCoreUrl);
- } catch (SolrServerException sse) {
- // mostly likely the core already exists ...
- if (safeCheckCoreExists(coreStatusUrl, coreName)) {
- // core already exists
- throw new IllegalArgumentException("Core '"+coreName+"' already exists!\nChecked core existence using Core API command:\n"+coreStatusUrl);
- } else {
- throw sse;
- }
- }
+ Map<String,Object> json = getJson(createCoreUrl);
CharArr arr = new CharArr();
new JSONWriter(arr, 2).write(json);
