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 2012/10/21 02:08:52 UTC

svn commit: r1400543 - in /manifoldcf/trunk: CHANGES.txt framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java

Author: kwright
Date: Sun Oct 21 00:08:51 2012
New Revision: 1400543

URL: http://svn.apache.org/viewvc?rev=1400543&view=rev
Log:
Fix for CONNECTORS-556.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1400543&r1=1400542&r2=1400543&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Oct 21 00:08:51 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.1-dev =====================
 
+CONNECTORS-556: performCommit() is in the wrong place for
+ingeststatus table update.
+(Karl Wright)
+
 CONNECTORS-542: Add pom.xml for LDAP authority.
 (Karl Wright)
 

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1400543&r1=1400542&r2=1400543&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Sun Oct 21 00:08:51 2012
@@ -1398,7 +1398,6 @@ public class IncrementalIngester extends
           }
 
           // Update failed to find a matching record, so try the insert
-          performCommit();
           break;
         }
         catch (ManifoldCFException e)
@@ -1452,6 +1451,7 @@ public class IncrementalIngester extends
       {
         performInsert(map,null);
         noteModifications(1,0,0);
+        performCommit();
         return;
       }
       catch (ManifoldCFException e)