You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2012/12/05 01:32:27 UTC
svn commit: r1417249 - in
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client: Get.java
Scan.java
Author: larsh
Date: Wed Dec 5 00:32:27 2012
New Revision: 1417249
URL: http://svn.apache.org/viewvc?rev=1417249&view=rev
Log:
HBASE-6206 Large tests fail with jdk1.7
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Get.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Scan.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Get.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Get.java?rev=1417249&r1=1417248&r2=1417249&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Get.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Get.java Wed Dec 5 00:32:27 2012
@@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.client;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.io.TimeRange;
@@ -131,6 +132,9 @@ public class Get extends OperationWithAt
if(set == null) {
set = new TreeSet<byte []>(Bytes.BYTES_COMPARATOR);
}
+ if (qualifier == null) {
+ qualifier = HConstants.EMPTY_BYTE_ARRAY;
+ }
set.add(qualifier);
familyMap.put(family, set);
return this;
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Scan.java?rev=1417249&r1=1417248&r2=1417249&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/Scan.java Wed Dec 5 00:32:27 2012
@@ -215,6 +215,9 @@ public class Scan extends OperationWithA
if(set == null) {
set = new TreeSet<byte []>(Bytes.BYTES_COMPARATOR);
}
+ if (qualifier == null) {
+ qualifier = HConstants.EMPTY_BYTE_ARRAY;
+ }
set.add(qualifier);
familyMap.put(family, set);