commit f57b02407a6bc46b74a251ec02382b1df01e7f05
author Karl Wright <kwright@apache.org> Wed Dec 04 01:53:27 2013 +0000
committer Karl Wright <kwright@apache.org> Wed Dec 04 01:53:27 2013 +0000
tree 8ac80c87fdab5a53f539a8241a552924a11c96c0
parent beff446ced419672c2edf7015302ccd388ee4bcf

Pull up fix for CONNECTORS-825 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-3.x/branches/release-1.1-branch@1547676 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index f364480..bd8b040 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
 
 ======================= 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.

mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java

diff --git a/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index 44fda93..e359927 100644
--- a/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -183,6 +183,7 @@
           if (domain == null)
             domain = "";
           domainMap.put(domain,userName);
+          i++;
         }
       }
       

mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

diff --git a/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 9c785bf..6a6df6d 100644
--- a/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -174,6 +174,7 @@
         if (domain == null)
           domain = "";
         domainMap.put(domain,userName);
+        i++;
       }
     }