accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [48/50] git commit: fixed compile bug caused by merge
Date Tue, 23 Jul 2013 16:55:13 GMT
fixed compile bug caused by merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5183ae44
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5183ae44
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5183ae44

Branch: refs/heads/ACCUMULO-1000
Commit: 5183ae44c087078331dbec7fbc654d6722a74c11
Parents: d0e8b37
Author: Keith Turner <kturner@apache.org>
Authored: Mon Jul 22 17:13:22 2013 -0400
Committer: Keith Turner <kturner@apache.org>
Committed: Mon Jul 22 17:13:22 2013 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/security/SecurityOperation.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5183ae44/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 64b6177..cebc338 100644
--- a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.server.security;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -32,7 +31,6 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.data.thrift.TColumn;
-import org.apache.accumulo.core.data.thrift.TConditionalMutation;
 import org.apache.accumulo.core.data.thrift.TKeyExtent;
 import org.apache.accumulo.core.data.thrift.TRange;
 import org.apache.accumulo.core.master.thrift.TableOperation;
@@ -334,8 +332,7 @@ public class SecurityOperation {
     
     authenticate(credentials);
     
-    return hasTablePermission(credentials.getPrincipal(), tableID, TablePermission.WRITE,
true)
-        && hasTablePermission(credentials.getPrincipal(), tableID, TablePermission.READ,
true);
+    return hasTablePermission(credentials, tableID, TablePermission.WRITE, true) &&
hasTablePermission(credentials, tableID, TablePermission.READ, true);
   }
 
   public boolean canSplitTablet(TCredentials credentials, String table) throws ThriftSecurityException
{


Mime
View raw message