accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1426303 - in /accumulo/branches/1.4: ./ src/ src/core/ src/core/src/main/java/org/apache/accumulo/core/iterators/system/ src/core/src/test/java/org/apache/accumulo/core/iterators/system/ src/server/
Date Thu, 27 Dec 2012 20:26:03 GMT
Author: kturner
Date: Thu Dec 27 20:26:03 2012
New Revision: 1426303

URL: http://svn.apache.org/viewvc?rev=1426303&view=rev
Log:
ACCUMULO-844 made visibilityfilter catch badargument exception (merged from tunk)

Added:
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
      - copied unchanged from r1426302, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/VisibilityFilterTest.java
Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
    accumulo/branches/1.4/src/server/   (props changed)

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1426302

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1426302
  Merged /accumulo/trunk:r1426302

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1426302
  Merged /accumulo/trunk/core:r1426302

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java?rev=1426303&r1=1426302&r2=1426303&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
(original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
Thu Dec 27 20:26:03 2012
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.VisibilityEvaluator;
 import org.apache.accumulo.core.security.VisibilityParseException;
+import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.hadoop.io.Text;
@@ -73,6 +74,9 @@ public class VisibilityFilter extends Fi
     } catch (VisibilityParseException e) {
       log.error("Parse Error", e);
       return false;
+    } catch (BadArgumentException e) {
+      log.error("Parse Error", e);
+      return false;
     }
   }
 }

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1426302
  Merged /accumulo/trunk/server:r1426302



Mime
View raw message