Return-Path: Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: (qmail 32847 invoked from network); 21 Oct 2010 21:58:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Oct 2010 21:58:11 -0000 Received: (qmail 41943 invoked by uid 500); 21 Oct 2010 21:58:11 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 41905 invoked by uid 500); 21 Oct 2010 21:58:11 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 41856 invoked by uid 99); 21 Oct 2010 21:58:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 21:58:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 21:58:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92A6C23889BF; Thu, 21 Oct 2010 21:57:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1026154 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java Date: Thu, 21 Oct 2010 21:57:14 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101021215714.92A6C23889BF@eris.apache.org> Author: stack Date: Thu Oct 21 21:57:14 2010 New Revision: 1026154 URL: http://svn.apache.org/viewvc?rev=1026154&view=rev Log: HBASE-3140 Rest schema modification throw null pointer exception Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1026154&r1=1026153&r2=1026154&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Thu Oct 21 21:57:14 2010 @@ -601,6 +601,8 @@ Release 0.21.0 - Unreleased HBASE-3031 CopyTable MR job named "Copy Table" in Driver HBASE-2658 REST (stargate) TableRegionModel Regions need to be updated to work w/ new region naming convention from HBASE-2531 + HBASE-3140 Rest schema modification throw null pointer exception + (David Worms via Stack) IMPROVEMENTS Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java?rev=1026154&r1=1026153&r2=1026154&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java Thu Oct 21 21:57:14 2010 @@ -150,7 +150,7 @@ public class SchemaResource extends Reso if (htd.hasFamily(hcd.getName())) { admin.modifyColumn(name, hcd); } else { - admin.addColumn(model.getName(), hcd); + admin.addColumn(name, hcd); } } } catch (IOException e) {