From 3ccfd50bd937571aeed3033561b7ca52c967f105 Mon Sep 17 00:00:00 2001 From: stack Date: Sat, 2 Nov 2019 09:33:48 -0700 Subject: [PATCH] HBASE-23244 NPEs running Canary (#784) Addendum to fix findbugs complaint. --- .../src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java index a967dab8175..4f59cf33284 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java @@ -492,7 +492,7 @@ public class CanaryTool implements Tool, Canary { sink.publishReadTiming(serverName, region, column, stopWatch.getTime()); } catch (Exception e) { sink.publishReadFailure(serverName, region, column, e); - sink.updateReadFailures(region == null? "NULL": region.getRegionNameAsString(), + sink.updateReadFailures(region.getRegionNameAsString(), serverName == null? "NULL": serverName.getHostname()); } finally { if (rs != null) {