Remove unneeded matchalldocs
git-svn-id: https://svn.apache.org/repos/asf/incubator/lcf/upstream/solr/SOLR-1895@1176302 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index fdd2d25..0283837 100644
--- a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -210,7 +210,6 @@
// Add the empty-acl case
BooleanQuery subUnprotectedClause = new BooleanQuery();
- subUnprotectedClause.add(new MatchAllDocsQuery(),BooleanClause.Occur.SHOULD);
subUnprotectedClause.add(allowOpen,BooleanClause.Occur.MUST);
subUnprotectedClause.add(denyOpen,BooleanClause.Occur.MUST);
bq.add(subUnprotectedClause,BooleanClause.Occur.SHOULD);
diff --git a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 91de235..6b09950 100644
--- a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -56,7 +56,7 @@
static final private String[] globalAllowed = { "solrpingquery" };
/** A logger we can use */
- private static final Logger LOG = LoggerFactory.getLogger(ManifoldCFSecurityFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ManifoldCFSearchComponent.class);
// Member variables
String authorityBaseURL = null;
@@ -209,7 +209,6 @@
// Add the empty-acl case
BooleanQuery subUnprotectedClause = new BooleanQuery();
- subUnprotectedClause.add(new MatchAllDocsQuery(),BooleanClause.Occur.SHOULD);
subUnprotectedClause.add(allowOpen,BooleanClause.Occur.MUST);
subUnprotectedClause.add(denyOpen,BooleanClause.Occur.MUST);
bq.add(subUnprotectedClause,BooleanClause.Occur.SHOULD);
