From 8dbecd87b7e27ef18494645fc2d81bcd4bed7908 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 12 Oct 2018 10:34:59 -0700 Subject: [PATCH] HBASE-21303 [shell] clear_deadservers with no args fails --- .../src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index a160204f18..b68bc185e1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InterruptedIOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; @@ -4233,15 +4234,13 @@ public class HBaseAdmin implements Admin { } @Override - public List clearDeadServers(final List servers) throws IOException { - if (servers == null || servers.size() == 0) { - throw new IllegalArgumentException("servers cannot be null or empty"); - } + public List clearDeadServers(List servers) throws IOException { return executeCallable(new MasterCallable>(getConnection(), getRpcControllerFactory()) { @Override protected List rpcCall() throws Exception { - ClearDeadServersRequest req = RequestConverter.buildClearDeadServersRequest(servers); + ClearDeadServersRequest req = RequestConverter. + buildClearDeadServersRequest(servers == null? Collections.EMPTY_LIST: servers); return ProtobufUtil.toServerNameList( master.clearDeadServers(getRpcController(), req).getServerNameList()); } -- 2.16.3