accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjno...@apache.org
Subject git commit: ACCUMULO-1730 Reinsert changes inadvertently lost in cherry-pick
Date Wed, 16 Oct 2013 01:44:01 GMT
Updated Branches:
  refs/heads/master cb97e82a4 -> 872b6db37


ACCUMULO-1730 Reinsert changes inadvertently lost in cherry-pick


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

Branch: refs/heads/master
Commit: 872b6db372bba953e3c435fcfcb1c64c0713ff49
Parents: cb97e82
Author: John Stoneham <jstoneham@texeltek.com>
Authored: Tue Oct 15 21:33:09 2013 -0400
Committer: Corey J. Nolet <cjnolet@gmail.com>
Committed: Tue Oct 15 21:44:30 2013 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/security/ColumnVisibility.java | 1 +
 .../org/apache/accumulo/core/security/ColumnVisibilityTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/872b6db3/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 55763bc..f9c8382 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -302,6 +302,7 @@ public class ColumnVisibility {
                 result.add(c);
             else
               result.add(child);
+            result.end = index - 1;
             return result;
           }
           case '"': {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/872b6db3/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
index c963688..260df5f 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
@@ -152,9 +152,9 @@ public class ColumnVisibilityTest {
   @Test
   public void testParseTree() {
     Node node = parse("(W)|(U&V)");
-    assertNode(node, NodeType.OR, 3, 4);
+    assertNode(node, NodeType.OR, 0, 9);
     assertNode(node.getChildren().get(0), NodeType.TERM, 1, 2);
-    assertNode(node.getChildren().get(1), NodeType.AND, 6, 7);
+    assertNode(node.getChildren().get(1), NodeType.AND, 5, 8);
   }
 
   @Test


Mime
View raw message