Repository: hbase Updated Branches: refs/heads/master 652b81ab1 -> 7aa3a2d89
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/7aa3a2d8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7aa3a2d8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7aa3a2d8 Branch: refs/heads/master Commit: 7aa3a2d890359f41af773815ccd11b6b3640138b Parents: 652b81a Author: Jimmy Xiang <[email protected]> Authored: Wed Oct 8 09:26:13 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Wed Oct 8 17:45:43 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/7aa3a2d8/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 18aa8aa..804ff18 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 @@ -1953,11 +1953,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;
