Repository: hbase Updated Branches: refs/heads/branch-1 0bec57e7c -> ae57b3099
HBASE-12206 NPE in RSRpcServices Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ae57b309 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ae57b309 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ae57b309 Branch: refs/heads/branch-1 Commit: ae57b3099110dba4f694a6fa81d148a13d619054 Parents: 0bec57e Author: Jimmy Xiang <[email protected]> Authored: Wed Oct 8 09:26:13 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Wed Oct 8 17:47:37 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/RSRpcServices.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ae57b309/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index e1eddcc..ad86720 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -1931,11 +1931,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, // If checkOpen failed, server not running or filesystem gone, // cancel this lease; filesystem is gone or we're closing or something. if (scannerName != null) { - try { - regionServer.leases.cancelLease(scannerName); - } catch (LeaseException le) { - LOG.info("Server shutting down and client tried to access missing scanner " + - scannerName); + LOG.debug("Server shutting down and client tried to access missing scanner " + + scannerName); + if (regionServer.leases != null) { + try { + regionServer.leases.cancelLease(scannerName); + } catch (LeaseException le) { + // No problem, ignore + } } } throw e;
