Author: apurtell
Date: Thu Oct 21 22:36:27 2010
New Revision: 1026169
URL: http://svn.apache.org/viewvc?rev=1026169&view=rev
Log:
HBASE-3140 Rest schema modification throws null pointer exception
Modified:
hbase/branches/0.20/CHANGES.txt
hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java
Modified: hbase/branches/0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.20/CHANGES.txt?rev=1026169&r1=1026168&r2=1026169&view=diff
==============================================================================
--- hbase/branches/0.20/CHANGES.txt (original)
+++ hbase/branches/0.20/CHANGES.txt Thu Oct 21 22:36:27 2010
@@ -11,6 +11,8 @@ Release 0.20.7 - Unreleased
HBASE-3121 [rest/stargate] Do not perform cache control when returning
results
HBASE-3115 HBaseClient wastes 1 TCP packet per RPC
+ HBASE-3140 Rest schema modification throw null pointer exception
+ (David Worms via Andrew Purtell)
IMPROVEMENTS
HBASE-2988 Support alternate compression for major compactions
Modified:
hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java?rev=1026169&r1=1026168&r2=1026169&view=diff
==============================================================================
---
hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java
(original)
+++
hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java
Thu Oct 21 22:36:27 2010
@@ -150,7 +150,7 @@ public class SchemaResource extends Reso
if (htd.hasFamily(hcd.getName())) {
admin.modifyColumn(name, hcd.getName(), hcd);
} else {
- admin.addColumn(model.getName(), hcd);
+ admin.addColumn(name, hcd);
}
}
} catch (IOException e) {
