svn commit: r1126556 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java

[apurtell]

Author: apurtell
Date: Mon May 23 15:58:55 2011
New Revision: 1126556

URL: http://svn.apache.org/viewvc?rev=1126556&view=rev
Log:
HBASE-3912 [Stargate] Columns not handle by Scan; fix NPE

Modified:
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java?rev=1126556&r1=1126555&r2=1126556&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java 
Mon May 23 15:58:55 2011
@@ -356,8 +356,12 @@ public class ScannerModel implements Pro
     Map<byte [], NavigableSet<byte []>> families = scan.getFamilyMap();
     if (families != null) {
       for (Map.Entry<byte [], NavigableSet<byte []>> entry : 
families.entrySet()) {
-        for (byte[] qualifier : entry.getValue()) {
-          model.addColumn(Bytes.add(entry.getKey(), COLUMN_DIVIDER, 
qualifier));
+        if (entry.getValue() != null) {
+          for (byte[] qualifier: entry.getValue()) {
+            model.addColumn(Bytes.add(entry.getKey(), COLUMN_DIVIDER, 
qualifier));
+          }
+        } else {
+          model.addColumn(entry.getKey());
         }
       }
     }