Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5727 Addendum fixes compilation in AccessController.java 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1311525 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-04-10 00:05:27 +00:00
parent 761916cebb
commit 1044d5e353
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
View File

@ -191,7 +191,7 @@ public class AccessController extends BaseRegionObserver
String tableName = Bytes.toString(table); String tableName = Bytes.toString(table);
ListMultimap<String,TablePermission> perms = t.getValue(); ListMultimap<String,TablePermission> perms = t.getValue();
byte[] serialized = AccessControlLists.writePermissionsAsBytes(perms, byte[] serialized = AccessControlLists.writePermissionsAsBytes(perms,
e.getRegion().getConf()); regionEnv.getConfiguration());
this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName, this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName,
serialized); serialized);
} }
@ -223,7 +223,7 @@ public class AccessController extends BaseRegionObserver
AccessControlLists.getTablePermissions(regionEnv.getConfiguration(), AccessControlLists.getTablePermissions(regionEnv.getConfiguration(),
Bytes.toBytes(tableName)); Bytes.toBytes(tableName));
byte[] serialized = AccessControlLists.writePermissionsAsBytes( byte[] serialized = AccessControlLists.writePermissionsAsBytes(
perms, e.getRegion().getConf()); perms, regionEnv.getConfiguration());
this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName, this.authManager.getZKPermissionWatcher().writeToZookeeper(tableName,
serialized); serialized);
} catch (IOException ex) { } catch (IOException ex) {
@ -654,7 +654,7 @@ public class AccessController extends BaseRegionObserver
try { try {
this.authManager = TableAuthManager.get( this.authManager = TableAuthManager.get(
e.getRegionServerServices().getZooKeeper(), e.getRegionServerServices().getZooKeeper(),
e.getRegion().getConf()); regionEnv.getConfiguration());
} catch (IOException ioe) { } catch (IOException ioe) {
// pass along as a RuntimeException, so that the coprocessor is unloaded // pass along as a RuntimeException, so that the coprocessor is unloaded
throw new RuntimeException("Error obtaining TableAuthManager", ioe); throw new RuntimeException("Error obtaining TableAuthManager", ioe);