incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1176302 - in /incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf: ManifoldCFQParserPlugin.java ManifoldCFSearchComponent.java
Date Tue, 27 Sep 2011 09:57:15 GMT
Author: kwright
Date: Tue Sep 27 09:57:15 2011
New Revision: 1176302

URL: http://svn.apache.org/viewvc?rev=1176302&view=rev
Log:
Remove unneeded matchalldocs

Modified:
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1176302&r1=1176301&r2=1176302&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
Tue Sep 27 09:57:15 2011
@@ -210,7 +210,6 @@ public class ManifoldCFQParserPlugin ext
       
       // 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);

Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1176302&r1=1176301&r2=1176302&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Tue Sep 27 09:57:15 2011
@@ -56,7 +56,7 @@ public class ManifoldCFSearchComponent e
   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 @@ public class ManifoldCFSearchComponent e
     
     // 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);



Mime
View raw message