Updated Branches: refs/heads/1.6.0-SNAPSHOT 9ae34e090 -> 8f9258500
ACCUMULO-1987 Fixes byte buffer copy bug This patch fixes an issue where the byte buffer for an authorization expression was being incorrectly handled on evaluation. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f925850 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f925850 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f925850 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 8f9258500e02e0be7965ebac3912d5dbd9e7c489 Parents: 9ae34e0 Author: Michael Allen <mich...@sqrrl.com> Authored: Sun Dec 8 21:54:17 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Mon Dec 9 11:18:33 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f925850/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index fa127fb..1a4f5eb 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -664,7 +664,8 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu @Override public boolean contains(ByteSequence auth) { try { - return security.userHasAuthorizations(credentials, Collections.<ByteBuffer> singletonList(ByteBuffer.wrap(auth.getBackingArray()))); + return security.userHasAuthorizations(credentials, + Collections.<ByteBuffer> singletonList(ByteBuffer.wrap(auth.getBackingArray(), auth.offset(), auth.length()))); } catch (ThriftSecurityException e) { throw new RuntimeException(e); } @@ -2819,7 +2820,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu if (openingOverlapping.contains(extent) || onlineOverlapping.contains(extent)) return; - + if (!unopenedOverlapping.contains(extent)) { log.info("assignment " + extent + " no longer in the unopened set"); return;
