hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1311525 - /hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
Date Tue, 10 Apr 2012 00:05:27 GMT
Author: tedyu
Date: Tue Apr 10 00:05:27 2012
New Revision: 1311525

URL: http://svn.apache.org/viewvc?rev=1311525&view=rev
Log:
HBASE-5727 Addendum fixes compilation in AccessController.java

Modified:
    hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java

Modified: hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
URL: http://svn.apache.org/viewvc/hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java?rev=1311525&r1=1311524&r2=1311525&view=diff
==============================================================================
--- hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
(original)
+++ hbase/trunk/security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
Tue Apr 10 00:05:27 2012
@@ -191,7 +191,7 @@ public class AccessController extends Ba
       String tableName = Bytes.toString(table);
       ListMultimap<String,TablePermission> perms = t.getValue();
       byte[] serialized = AccessControlLists.writePermissionsAsBytes(perms,
-          e.getRegion().getConf());
+          regionEnv.getConfiguration());
       this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName,
         serialized);
     }
@@ -223,7 +223,7 @@ public class AccessController extends Ba
           AccessControlLists.getTablePermissions(regionEnv.getConfiguration(),
               Bytes.toBytes(tableName));
         byte[] serialized = AccessControlLists.writePermissionsAsBytes(
-            perms, e.getRegion().getConf());
+            perms, regionEnv.getConfiguration());
         this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName,
           serialized);
       } catch (IOException ex) {
@@ -654,7 +654,7 @@ public class AccessController extends Ba
     try {
       this.authManager = TableAuthManager.get(
           e.getRegionServerServices().getZooKeeper(),
-          e.getRegion().getConf());
+          regionEnv.getConfiguration());
     } catch (IOException ioe) {
       // pass along as a RuntimeException, so that the coprocessor is unloaded
       throw new RuntimeException("Error obtaining TableAuthManager", ioe);



Mime
View raw message