svn commit: r647953 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[jimk]

Author: jimk
Date: Mon Apr 14 12:27:17 2008
New Revision: 647953

URL: http://svn.apache.org/viewvc?rev=647953&view=rev
Log:
NPE getting scanner

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=647953&r1=647952&r2=647953&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Apr 14 12:27:17 2008
@@ -1,6 +1,7 @@
 Hbase Change Log
   INCOMPATIBLE CHANGES
    HBASE-521   Improve client scanner interface
+   HBASE-577   NPE getting scanner
   
   BUG FIXES
    HBASE-550   EOF trying to read reconstruction log stops region deployment

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=647953&r1=647952&r2=647953&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Mon Apr 14 12:27:17 2008
@@ -1114,6 +1114,19 @@
     final long timestamp, final RowFilterInterface filter)
   throws IOException {
     checkOpen();
+    NullPointerException npe = null;
+    if (regionName == null) {
+      npe = new NullPointerException("regionName is null");
+    } else if (cols == null) {
+      npe = new NullPointerException("columns to scan is null");
+    } else if (firstRow == null) {
+      npe = new NullPointerException("firstRow for scanner is null");
+    }
+    if (npe != null) {
+      IOException io = new IOException("Invalid arguments to openScanner");
+      io.initCause(npe);
+      throw io;
+    }
     requestCount.incrementAndGet();
     try {
       HRegion r = getRegion(regionName);