From 0a15699caa5d7d3a6b72977f90857d0a78a2fd70 Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Thu, 30 Jun 2016 22:32:23 +0530
Subject: [PATCH] SOLR-8787: Shutdown MiniSolrCloudCluster in a finally block

---
 .../cloud/TestAuthenticationFramework.java    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
index 6e3c28adbca..08db69266dd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
@@ -104,27 +104,28 @@ public class TestAuthenticationFramework extends LuceneTestCase {
   public void testBasics() throws Exception {
 
     MiniSolrCloudCluster miniCluster = createMiniSolrCloudCluster();
-
-    // Should pass
-    collectionCreateSearchDelete(miniCluster);
-
-    MockAuthenticationPlugin.expectedUsername = "solr";
-    MockAuthenticationPlugin.expectedPassword = "s0lrRocks";
-    
-    // Should fail with 401
     try {
+      // Should pass
       collectionCreateSearchDelete(miniCluster);
-      fail("Should've returned a 401 error");
-    } catch (Exception ex) {
-      if (!ex.getMessage().contains("Error 401")) {
+
+      MockAuthenticationPlugin.expectedUsername = "solr";
+      MockAuthenticationPlugin.expectedPassword = "s0lrRocks";
+
+      // Should fail with 401
+      try {
+        collectionCreateSearchDelete(miniCluster);
         fail("Should've returned a 401 error");
+      } catch (Exception ex) {
+        if (!ex.getMessage().contains("Error 401")) {
+          fail("Should've returned a 401 error");
+        }
+      } finally {
+        MockAuthenticationPlugin.expectedUsername = null;
+        MockAuthenticationPlugin.expectedPassword = null;
       }
     } finally {
-      MockAuthenticationPlugin.expectedUsername = null;
-      MockAuthenticationPlugin.expectedPassword = null;
+      miniCluster.shutdown();
     }
-
-    miniCluster.shutdown();
   }
 
   @After