Repository: hbase
Updated Branches:
  refs/heads/master c9f84e813 -> 5e23b3aad


HBASE-16359 NullPointerException in RSRpcServices.openRegion()


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5e23b3aa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e23b3aa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e23b3aa

Branch: refs/heads/master
Commit: 5e23b3aad5fffbb564d793f1d722d152e39f628a
Parents: c9f84e8
Author: tedyu <[email protected]>
Authored: Thu Aug 4 20:46:48 2016 -0700
Committer: tedyu <[email protected]>
Committed: Thu Aug 4 20:46:48 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java  | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5e23b3aa/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 f9b78e1..0de4a28 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
@@ -1741,6 +1741,9 @@ public class RSRpcServices implements 
HBaseRPCErrorHandler,
           } else {
             
regionServer.updateRegionFavoredNodesMapping(region.getEncodedName(),
               regionOpenInfo.getFavoredNodesList());
+            if (htd == null) {
+              throw new IOException("Missing table descriptor for " + 
region.getEncodedName());
+            }
             if (htd.getPriority() >= HConstants.ADMIN_QOS || 
region.getTable().isSystemTable()) {
               regionServer.service.submit(new OpenPriorityRegionHandler(
                 regionServer, regionServer, region, htd, masterSystemTime));

Reply via email to