Skip to content

Commit 193e349

Browse files
authored
Revert "HBASE-27068 NPE occurs when the active master has not yet been elected (apache#4474)"
This reverts commit 8260d6c.
1 parent feff846 commit 193e349

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ java.util.*;
2424
org.apache.hadoop.hbase.ServerName;
2525
org.apache.hadoop.hbase.ClusterMetrics;
2626
org.apache.hadoop.hbase.master.HMaster;
27-
org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
2827
</%import>
2928
<%if (!master.isActiveMaster()) %>
3029
<%java>
3130
ServerName active_master = master.getActiveMaster().orElse(null);
32-
Preconditions.checkState(active_master != null, "Failed to retrieve active master's ServerName!");
33-
int activeInfoPort = master.getActiveMasterInfoPort();
31+
assert active_master != null : "Failed to retrieve active master's ServerName!";
32+
int activeInfoPort = active_master == null ? 0 : master.getActiveMasterInfoPort();
3433
</%java>
3534
<div class="row inner_header">
3635
<div class="page-header">

0 commit comments

Comments
 (0)