From 2bd9347c7506bd5f5bea200f63dfb9488f68fc5a Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Wed, 5 Jul 2017 06:26:15 +0530
Subject: [PATCH] SOLR-10643: SOLR-10745: Remove unnecessary check for locked.
 It is always true.

---
 .../solr/cloud/autoscaling/TriggerIntegrationTest.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
index a7bfa11f88d..be53418e76e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
@@ -271,9 +271,7 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
           fail("Trigger should not have fired more than once!");
         }
       } finally {
-        if (locked) {
-          lock.unlock();
-        }
+        lock.unlock();
       }
     }
   }
@@ -815,9 +813,7 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
         log.debug("--throwable", t);
         throw t;
       } finally {
-        if (locked) {
-          lock.unlock();
-        }
+        lock.unlock();
       }
     }