Repository: accumulo Updated Branches: refs/heads/master 6128f024d -> 2e171cdb8
ACCUMULO-3079 minor corrections to VisibilityFilters Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e171cdb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e171cdb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e171cdb Branch: refs/heads/master Commit: 2e171cdb8420f817ff9ebeb23f9d8a70b0878ca5 Parents: 6128f02 Author: Mike Miller <[email protected]> Authored: Thu May 4 16:01:02 2017 -0400 Committer: Mike Miller <[email protected]> Committed: Thu May 4 16:01:02 2017 -0400 ---------------------------------------------------------------------- .../core/iterators/system/VisibilityFilter.java | 5 +---- .../accumulo/core/iterators/user/VisibilityFilter.java | 13 ++++--------- 2 files changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e171cdb/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java index 6037233..3fb7429 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java @@ -76,10 +76,7 @@ public class VisibilityFilter extends SynchronizedServerFilter { Boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray())); cache.put(testVis, bb); return bb; - } catch (VisibilityParseException e) { - log.error("Parse Error", e); - return false; - } catch (BadArgumentException e) { + } catch (VisibilityParseException | BadArgumentException e) { log.error("Parse Error", e); return false; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e171cdb/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java index e0c0b0f..0b0081a 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java @@ -35,7 +35,8 @@ import org.apache.accumulo.core.security.VisibilityEvaluator; import org.apache.accumulo.core.security.VisibilityParseException; import org.apache.accumulo.core.util.BadArgumentException; import org.apache.commons.collections.map.LRUMap; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A SortedKeyValueIterator that filters based on ColumnVisibility. @@ -45,16 +46,13 @@ public class VisibilityFilter extends Filter implements OptionDescriber { protected VisibilityEvaluator ve; protected LRUMap cache; - private static final Logger log = Logger.getLogger(VisibilityFilter.class); + private static final Logger log = LoggerFactory.getLogger(VisibilityFilter.class); private static final String AUTHS = "auths"; private static final String FILTER_INVALID_ONLY = "filterInvalid"; private boolean filterInvalid; - /** - * - */ public VisibilityFilter() {} @Override @@ -99,10 +97,7 @@ public class VisibilityFilter extends Filter implements OptionDescriber { Boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray())); cache.put(testVis, bb); return bb; - } catch (VisibilityParseException e) { - log.error("Parse Error", e); - return false; - } catch (BadArgumentException e) { + } catch (VisibilityParseException | BadArgumentException e) { log.error("Parse Error", e); return false; }
