From fd7ee9e29c429237584fe5cc4ee1e3e761cee26f Mon Sep 17 00:00:00 2001
From: anoopsamjohn <anoopsamjohn@unknown>
Date: Thu, 28 Nov 2013 17:52:27 +0000
Subject: [PATCH] HBASE-10005 TestVisibilityLabels fails occasionally
 (addendum)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1546408 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hbase/security/visibility/VisibilityController.java     | 6 +++---
 .../hbase/security/visibility/TestVisibilityLabels.java     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
index c4d2002a2da..935c7a30098 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
@@ -1166,7 +1166,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
     GetAuthsResponse.Builder response = GetAuthsResponse.newBuilder();
     response.setUser(request.getUser());
     try {
-      List<String> labels = getUserAuthsFromLablesTable(user);
+      List<String> labels = getUserAuthsFromLabelsTable(user);
       for (String label : labels) {
         response.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label)));
       }
@@ -1176,7 +1176,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
     done.run(response.build());
   }
 
-  private List<String> getUserAuthsFromLablesTable(byte[] user) throws IOException {
+  private List<String> getUserAuthsFromLabelsTable(byte[] user) throws IOException {
     Scan s = new Scan();
     s.addColumn(LABELS_TABLE_FAMILY, user);
     Filter filter = createVisibilityLabelFilter(this.regionEnv.getRegion(), new Authorizations(
@@ -1210,7 +1210,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
     byte[] user = request.getUser().toByteArray();
     try {
       checkCallingUserAuth();
-      List<String> currentAuths = this.getUserAuthsFromLablesTable(user);
+      List<String> currentAuths = this.getUserAuthsFromLabelsTable(user);
       List<Mutation> deletes = new ArrayList<Mutation>(auths.size());
       RegionActionResult successResult = RegionActionResult.newBuilder().build();
       for (ByteString authBS : auths) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
index eb01cabf41a..6ad05d7b49d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
@@ -550,7 +550,7 @@ public class TestVisibilityLabels {
   }
 
   @Test
-  public void testLablesWithCheckAndPut() throws Throwable {
+  public void testLabelsWithCheckAndPut() throws Throwable {
     TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
     HTable table = null;
     try {
@@ -582,7 +582,7 @@ public class TestVisibilityLabels {
   }
 
   @Test
-  public void testLablesWithIncrement() throws Throwable {
+  public void testLabelsWithIncrement() throws Throwable {
     TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
     HTable table = null;
     try {
@@ -614,7 +614,7 @@ public class TestVisibilityLabels {
   }
 
   @Test
-  public void testLablesWithAppend() throws Throwable {
+  public void testLabelsWithAppend() throws Throwable {
     TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
     HTable table = null;
     try {