Index: src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (revision 1024401) +++ src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (working copy) @@ -3686,10 +3686,11 @@ assertTrue(Bytes.equals(result.getValue(HConstants.CATALOG_FAMILY, null), one)); } - /** + /** * For HBASE-2156 * @throws Exception */ + @Test public void testScanVariableReuse() throws Exception { Scan scan = new Scan(); scan.addFamily(FAMILY); @@ -3700,7 +3701,8 @@ scan = new Scan(); scan.addFamily(FAMILY); - assertTrue(scan.getFamilyMap().get(FAMILY).size() == 0); + assertTrue(scan.getFamilyMap().get(FAMILY) == null); + assertTrue(scan.getFamilyMap().containsKey(FAMILY)); } /**