Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 86E32792E for ; Sat, 24 Sep 2011 07:38:32 +0000 (UTC) Received: (qmail 6331 invoked by uid 500); 24 Sep 2011 07:38:32 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 6277 invoked by uid 500); 24 Sep 2011 07:38:31 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 6265 invoked by uid 99); 24 Sep 2011 07:38:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Sep 2011 07:38:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Sep 2011 07:38:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 647BC2388900; Sat, 24 Sep 2011 07:38:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1175120 - /incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java Date: Sat, 24 Sep 2011 07:38:10 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110924073810.647BC2388900@eris.apache.org> Author: kwright Date: Sat Sep 24 07:38:10 2011 New Revision: 1175120 URL: http://svn.apache.org/viewvc?rev=1175120&view=rev Log: Simplify the filters Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java?rev=1175120&r1=1175119&r2=1175120&view=diff ============================================================================== --- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java (original) +++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java Sat Sep 24 07:38:10 2011 @@ -198,22 +198,20 @@ public class ManifoldCFSecurityFilter ex BooleanFilter bf = new BooleanFilter(); // Add a clause for each token. This will be added directly to the main filter (as a deny test), as well as to an OR's subclause (as an allow test). - BooleanFilter orFilter = new BooleanFilter(); // Add the empty-acl case BooleanFilter subUnprotectedClause = new BooleanFilter(); subUnprotectedClause.add(new FilterClause(new QueryWrapperFilter(new WildcardQuery(new Term(allowField,"*"))),BooleanClause.Occur.MUST_NOT)); subUnprotectedClause.add(new FilterClause(new QueryWrapperFilter(new WildcardQuery(new Term(denyField,"*"))),BooleanClause.Occur.MUST_NOT)); - orFilter.add(new FilterClause(subUnprotectedClause,BooleanClause.Occur.SHOULD)); + bf.add(new FilterClause(subUnprotectedClause,BooleanClause.Occur.SHOULD)); for (String accessToken : userAccessTokens) { TermsFilter tf = new TermsFilter(); tf.addTerm(new Term(allowField,accessToken)); - orFilter.add(new FilterClause(tf,BooleanClause.Occur.SHOULD)); + bf.add(new FilterClause(tf,BooleanClause.Occur.SHOULD)); tf = new TermsFilter(); tf.addTerm(new Term(denyField,accessToken)); bf.add(new FilterClause(tf,BooleanClause.Occur.MUST_NOT)); } - bf.add(new FilterClause(orFilter,BooleanClause.Occur.MUST)); return bf; }