Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9214310FD0 for ; Mon, 9 Dec 2013 16:19:20 +0000 (UTC) Received: (qmail 52923 invoked by uid 500); 9 Dec 2013 16:19:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 52888 invoked by uid 500); 9 Dec 2013 16:19:19 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 52877 invoked by uid 99); 9 Dec 2013 16:19:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Dec 2013 16:19:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 17FD98B163D; Mon, 9 Dec 2013 16:19:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Mon, 09 Dec 2013 16:19:14 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-1987 Fixes byte buffer copy bug Updated Branches: refs/heads/master d95d9eadf -> 71dc0527f 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/master Commit: 8f9258500e02e0be7965ebac3912d5dbd9e7c489 Parents: 9ae34e0 Author: Michael Allen Authored: Sun Dec 8 21:54:17 2013 -0500 Committer: John Vines 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. singletonList(ByteBuffer.wrap(auth.getBackingArray()))); + return security.userHasAuthorizations(credentials, + Collections. 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;