You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/30 07:08:15 UTC

svn commit: r1378800 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Author: stack
Date: Thu Aug 30 05:08:14 2012
New Revision: 1378800

URL: http://svn.apache.org/viewvc?rev=1378800&view=rev
Log:
HBASE-662 [shell] Cannot describe '.META.' or '-ROOT-' tables

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1378800&r1=1378799&r2=1378800&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Aug 30 05:08:14 2012
@@ -904,7 +904,9 @@ public class HBaseAdmin implements Abort
    * @throws IOException if a remote or network exception occurs
    */
   public boolean isTableEnabled(byte[] tableName) throws IOException {
-    HTableDescriptor.isLegalTableName(tableName);
+    if (!HTableDescriptor.isMetaTable(tableName)) {
+      HTableDescriptor.isLegalTableName(tableName);
+    }
     return connection.isTableEnabled(tableName);
   }
 
@@ -923,7 +925,9 @@ public class HBaseAdmin implements Abort
    * @throws IOException if a remote or network exception occurs
    */
   public boolean isTableDisabled(byte[] tableName) throws IOException {
-    HTableDescriptor.isLegalTableName(tableName);
+    if (!HTableDescriptor.isMetaTable(tableName)) {
+      HTableDescriptor.isLegalTableName(tableName);
+    }
     return connection.isTableDisabled(tableName);
   }