You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/12/04 02:53:28 UTC
svn commit: r1547676 - in
/manifoldcf/integration/solr-3.x/branches/release-1.1-branch: ./
CHANGES.txt mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Author: kwright
Date: Wed Dec 4 01:53:27 2013
New Revision: 1547676
URL: http://svn.apache.org/r1547676
Log:
Pull up fix for CONNECTORS-825 from trunk.
Modified:
manifoldcf/integration/solr-3.x/branches/release-1.1-branch/ (props changed)
manifoldcf/integration/solr-3.x/branches/release-1.1-branch/CHANGES.txt
manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Propchange: manifoldcf/integration/solr-3.x/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/integration/solr-3.x/trunk:r1547670,1547675
Modified: manifoldcf/integration/solr-3.x/branches/release-1.1-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/branches/release-1.1-branch/CHANGES.txt?rev=1547676&r1=1547675&r2=1547676&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/integration/solr-3.x/branches/release-1.1-branch/CHANGES.txt Wed Dec 4 01:53:27 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.1 =====================
+CONNECTORS-825: Fix infinite loop in new code.
+(Shinichiro Abe)
+
Add functionality making the plugin compatible with multi-domain
features of ManifoldCF. Specifically, allow multiple domain/username
tuples to be passed in the request.
Modified: manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1547676&r1=1547675&r2=1547676&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Wed Dec 4 01:53:27 2013
@@ -183,6 +183,7 @@ public class ManifoldCFQParserPlugin ext
if (domain == null)
domain = "";
domainMap.put(domain,userName);
+ i++;
}
}
Modified: manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1547676&r1=1547675&r2=1547676&view=diff
==============================================================================
--- manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ manifoldcf/integration/solr-3.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Wed Dec 4 01:53:27 2013
@@ -174,6 +174,7 @@ public class ManifoldCFSearchComponent e
if (domain == null)
domain = "";
domainMap.put(domain,userName);
+ i++;
}
}