Index: src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java =================================================================== --- src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java (revision 721410) +++ src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java (working copy) @@ -166,7 +166,7 @@ failed2 = true; } assertTrue(failed2); - assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0); + assertNull(handler.getRow(tableAname, rowBname)); // Teardown handler.disableTable(tableAname); @@ -231,7 +231,7 @@ } assertTrue(failed); assertTrue(Bytes.equals(handler.get(tableAname, rowAname, columnBname).value, valueCname)); - assertEquals(handler.getRow(tableAname, rowBname).columns.size(), 0); + assertNull(handler.getRow(tableAname, rowBname)); // Teardown handler.disableTable(tableAname); Index: src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (revision 721410) +++ src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (working copy) @@ -325,12 +325,16 @@ try { HTable table = getTable(tableName); if (columns == null) { - return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row), - timestamp)); + RowResult result = table.getRow(getText(row), timestamp); + if (result == null) + return null; + return ThriftUtilities.rowResultFromHBase(result); } else { byte[][] columnArr = columns.toArray(new byte[columns.size()][]); - return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row), - columnArr, timestamp)); + RowResult result = table.getRow(getText(row), columnArr, timestamp); + if (result == null) + return null; + return ThriftUtilities.rowResultFromHBase(result); } } catch (IOException e) { throw new IOError(e.getMessage());