Author: kwright
Date: Wed Nov 13 07:51:54 2013
New Revision: 1541410
URL: http://svn.apache.org/r1541410
Log:
Pull up fix for CONNECTORS-807 from trunk.
Modified:
manifoldcf/branches/release-1.4-branch/ (props changed)
manifoldcf/branches/release-1.4-branch/CHANGES.txt
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Propchange: manifoldcf/branches/release-1.4-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1540759
Modified: manifoldcf/branches/release-1.4-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/CHANGES.txt?rev=1541410&r1=1541409&r2=1541410&view=diff
==============================================================================
--- manifoldcf/branches/release-1.4-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.4-branch/CHANGES.txt Wed Nov 13 07:51:54 2013
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.4.1 =====================
+CONNECTORS-807: Handle the case when there are no documents being
+deleted.
+(Adian Conlon, Karl Wright)
+
CONNECTORS-806: Web connector session passwords were not being
handled in the UI properly.
(Karl Wright)
Modified:
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1541410&r1=1541409&r2=1541410&view=diff
==============================================================================
---
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Wed Nov 13 07:51:54 2013
@@ -709,7 +709,8 @@ public class JobQueue extends org.apache
list.add(identifiers[i].getID());
i++;
}
- doDeletes(list);
+ if (list.size() > 0)
+ doDeletes(list);
noteModifications(0,0,identifiers.length);
}