From 2443a7e6c1ec7ec24550880deb08189853276318 Mon Sep 17 00:00:00 2001
From: Timothy Potter <thelabdude@apache.org>
Date: Sat, 15 Aug 2015 15:43:36 +0000
Subject: [PATCH] SOLR-7934: SolrCLI masks underlying cause of create
 collection failure.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1696056 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                              |  2 ++
 .../java/org/apache/solr/util/SolrCLI.java    | 21 ++-----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e433a1e25b6..9a7ba56afa9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -390,6 +390,8 @@ Bug Fixes
 * 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 a882ca463b8..edf2a8195bd 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 @@ public class SolrCLI {
       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 @@ public class SolrCLI {
 
       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);