svn commit: r1149764 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java

[nspiegelberg]

Author: nspiegelberg
Date: Fri Jul 22 23:38:58 2011
New Revision: 1149764

URL: http://svn.apache.org/viewvc?rev=1149764&view=rev
Log:
HBASE-4127 Don't modify table's name away in HBaseAdmin

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1149764&r1=1149763&r2=1149764&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Jul 22 23:38:58 2011
@@ -168,6 +168,7 @@ Release 0.91.0 - Unreleased
                cannot be changed (fulin wang via Ted Yu)
    HBASE-4118  method regionserver.MemStore#updateColumnValue: the check for 
                qualifier and family is missing (N Keywal via Ted Yu)
+   HBASE-4127  Don't modify table's name away in HBaseAdmin
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java?rev=1149764&r1=1149763&r2=1149764&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
 Fri Jul 22 23:38:58 2011
@@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.HRegionIn
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.Server;
 import org.apache.hadoop.hbase.master.MasterServices;
+import org.apache.hadoop.hbase.util.Bytes;
 
 public class ModifyTableHandler extends TableEventHandler {
   private final HTableDescriptor htd;
@@ -35,6 +36,10 @@ public class ModifyTableHandler extends 
       final MasterServices masterServices) throws IOException {
     super(EventType.C_M_MODIFY_TABLE, tableName, server, masterServices);
     this.htd = htd;
+    if (!Bytes.equals(tableName, htd.getName())) {
+      throw new IOException("TableDescriptor name & tableName must match: " 
+          + htd.getNameAsString() + " vs " + Bytes.toString(tableName));
+    }
   }
 
   @Override
@@ -52,4 +57,4 @@ public class ModifyTableHandler extends 
     }
     return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + 
tableNameStr;
   }
-}
\ No newline at end of file
+}