From 437d1374141c7e8ff215bc273f96fca0b6604caa Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Thu, 14 Jan 2010 01:39:27 +0000
Subject: [PATCH] HBASE-2120 [stargate] Unable to delete column families

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@899022 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                   | 2 ++
 .../java/org/apache/hadoop/hbase/stargate/RowResource.java    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index df084a59b45..52efb523eb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -156,6 +156,8 @@ Release 0.21.0 - Unreleased
                (Kay Kay via JD)
    HBASE-2101  KeyValueSortReducer collapses all values to last passed
    HBASE-2119  Fix top-level NOTICES.txt file. Its stale.
+   HBASE-2120  [stargate] Unable to delete column families (Greg Lu via Andrew
+               Purtell)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java b/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
index 32a0a421291..4dab7e2f396 100644
--- a/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
+++ b/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
@@ -281,13 +281,13 @@ public class RowResource implements Constants {
     for (byte[] column: rowspec.getColumns()) {
       byte[][] split = KeyValue.parseColumn(column);
       if (rowspec.hasTimestamp()) {
-        if (split.length == 2) {
+        if (split.length == 2 && split[1].length != 0) {
           delete.deleteColumns(split[0], split[1], rowspec.getTimestamp());
         } else {
           delete.deleteFamily(split[0], rowspec.getTimestamp());
         }
       } else {
-        if (split.length == 2) {
+        if (split.length == 2 && split[1].length != 0) {
           delete.deleteColumns(split[0], split[1]);
         } else {
           delete.deleteFamily(split[0]);