You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/08/16 03:41:49 UTC
svn commit: r1158084 -
/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: tedyu
Date: Tue Aug 16 01:41:49 2011
New Revision: 1158084
URL: http://svn.apache.org/viewvc?rev=1158084&view=rev
Log:
HBASE-4197 Added check of scanner against null
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1158084&r1=1158083&r2=1158084&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Aug 16 01:41:49 2011
@@ -452,8 +452,7 @@ public class HRegionServer implements HR
}
String scannerIdString = Long.toString(scannerId);
RegionScanner scanner = scanners.get(scannerIdString);
- HRegionInfo regionName = scanner.getRegionInfo();
- if (regionName.isMetaRegion()) {
+ if (scanner != null && scanner.getRegionInfo().isMetaRegion()) {
// LOG.debug("High priority scanner request: " + scannerId);
return HIGH_QOS;
}