From 0d5751fa4b7968768bc07e303fbfc9074ccfc098 Mon Sep 17 00:00:00 2001
From: Rushabh Shah <rushabh.shah@rushabh-ltmflld.internal.salesforce.com>
Date: Wed, 11 Aug 2021 10:59:06 -0400
Subject: [PATCH] HBASE-26185 Return mutable list in
 AssignmentManager#getExcludedServersForSystemTable

---
 .../hadoop/hbase/master/assignment/AssignmentManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 5622a58f9665..7c2ead38435c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -2322,7 +2322,7 @@ public List<ServerName> getExcludedServersForSystemTable() {
       .map(s->new Pair<>(s, master.getRegionServerVersion(s)))
       .collect(Collectors.toList());
     if (serverList.isEmpty()) {
-      return Collections.emptyList();
+      return new ArrayList<>();
     }
     String highestVersion = Collections.max(serverList,
       (o1, o2) -> VersionInfo.compareVersion(o1.getSecond(), o2.getSecond())).getSecond();
@@ -2330,7 +2330,7 @@ public List<ServerName> getExcludedServersForSystemTable() {
       int comparedValue = VersionInfo.compareVersion(minVersionToMoveSysTables,
         highestVersion);
       if (comparedValue > 0) {
-        return Collections.emptyList();
+        return new ArrayList<>();
       }
     }
     return serverList.stream()