incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1190287 - in /incubator/accumulo/trunk: ./ src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
Date Fri, 28 Oct 2011 13:00:12 GMT
Author: ecn
Date: Fri Oct 28 13:00:12 2011
New Revision: 1190287

URL: http://svn.apache.org/viewvc?rev=1190287&view=rev
Log:
ACCUMULO-90: merge from 1.3 branch

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
    incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/accumulo/branches/1.3:1190280

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1190287&r1=1190286&r2=1190287&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
Fri Oct 28 13:00:12 2011
@@ -59,6 +59,7 @@ public class Authorizations implements I
     
     validAuthChars['_'] = true;
     validAuthChars['-'] = true;
+    validAuthChars[':'] = true;
   }
   
   static final boolean isValidAuthChar(byte b) {

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java?rev=1190287&r1=1190286&r2=1190287&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
(original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
Fri Oct 28 13:00:12 2011
@@ -1,8 +1,8 @@
 package org.apache.accumulo.core.security;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
 
-import org.apache.accumulo.core.security.ColumnVisibility;
 import org.junit.Test;
 
 public class ColumnVisibilityTest {
@@ -39,6 +39,7 @@ public class ColumnVisibilityTest {
   public void testCompound() {
     shouldNotThrow("a|b", "a&b", "ab&bc");
     shouldNotThrow("A&B&C&D&E", "A|B|C|D|E", "(A|B|C)", "(A)|B|(C)", "A&(B)&(C)",
"A&B&(L)");
+    shouldNotThrow("_&-&:");
   }
   
   @Test



Mime
View raw message