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:59:16 UTC
svn commit: r1547680 - in
/manifoldcf/integration/solr-4.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:59:15 2013
New Revision: 1547680
URL: http://svn.apache.org/r1547680
Log:
Pull up fix for CONNETORS-825.
Modified:
manifoldcf/integration/solr-4.x/branches/release-1.1-branch/ (props changed)
manifoldcf/integration/solr-4.x/branches/release-1.1-branch/CHANGES.txt
manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Propchange: manifoldcf/integration/solr-4.x/branches/release-1.1-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/integration/solr-4.x/trunk:r1547671
Modified: manifoldcf/integration/solr-4.x/branches/release-1.1-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-1.1-branch/CHANGES.txt?rev=1547680&r1=1547679&r2=1547680&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/integration/solr-4.x/branches/release-1.1-branch/CHANGES.txt Wed Dec 4 01:59:15 2013
@@ -1,6 +1,11 @@
Apache ManifoldCF Plugin for Apache Solr 4.x change Log
$Id$
+======================= Release 1.1.1 =====================
+
+CONNECTORS-825: Fix infinite loop parsing multi-domain arguments.
+(Shinichiro Abe)
+
======================= Release 1.1 =====================
Add functionality making the plugin compatible with multi-domain
Modified: manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1547680&r1=1547679&r2=1547680&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Wed Dec 4 01:59:15 2013
@@ -199,6 +199,7 @@ public class ManifoldCFQParserPlugin ext
if (domain == null)
domain = "";
domainMap.put(domain,userName);
+ i++;
}
}
Modified: manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1547680&r1=1547679&r2=1547680&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ manifoldcf/integration/solr-4.x/branches/release-1.1-branch/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Wed Dec 4 01:59:15 2013
@@ -185,6 +185,7 @@ public class ManifoldCFSearchComponent e
if (domain == null)
domain = "";
domainMap.put(domain,userName);
+ i++;
}
}