From 65d9c0d6d2c61e17ff45129fb8255d92336f41f7 Mon Sep 17 00:00:00 2001 From: Jonathan Hsieh Date: Wed, 13 Feb 2013 18:40:18 +0000 Subject: [PATCH] HBASE-7459 NPE in HMaster TestLocalHBaseCluster git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290@1445820 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 6ad9215c614..c66d4473be7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2044,7 +2044,9 @@ Server { } public void shutdown() throws IOException { - spanReceiverHost.closeReceivers(); + if (spanReceiverHost != null) { + spanReceiverHost.closeReceivers(); + } if (cpHost != null) { cpHost.preShutdown(); }