manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1636688 - in /manifoldcf/branches/release-1.7-branch: ./ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Date Tue, 04 Nov 2014 18:40:51 GMT
Author: kwright
Date: Tue Nov  4 18:40:50 2014
New Revision: 1636688

URL: http://svn.apache.org/r1636688
Log:
Pull up another fix for CONNECTORS-1091 from dev_1x branch

Modified:
    manifoldcf/branches/release-1.7-branch/   (props changed)
    manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java

Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/dev_1x:r1636686
  Merged /manifoldcf/trunk:r1636684

Modified: manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1636688&r1=1636687&r2=1636688&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++ manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Tue Nov  4 18:40:50 2014
@@ -218,6 +218,10 @@ public class JobQueue extends org.apache
         map.put(docPriorityField,nullDocPriority);
         performUpdate(map,"WHERE "+docPriorityField+" IS NULL",null,null);
         
+        map = new HashMap();
+        map.put(prioritySetField,new Long(0L));
+        performUpdate(map,"WHERE "+prioritySetField+" IS NULL",null,null);
+        
         // Also, add processIDField
         if (existing.get(processIDField) == null)
         {
@@ -903,7 +907,7 @@ public class JobQueue extends org.apache
     throws ManifoldCFException
   {
     HashMap map = new HashMap();
-    map.put(prioritySetField,null);
+    map.put(prioritySetField,new Long(0L));
     map.put(docPriorityField,nullDocPriority);
     ArrayList list = new ArrayList();
     String query = buildConjunctionClause(list,new ClauseDescription[]{
@@ -932,7 +936,7 @@ public class JobQueue extends org.apache
       checkTimeValue = null;
       // Remove document priority; we don't want to pollute the queue.  See CONNECTORS-290.
       map.put(docPriorityField,nullDocPriority);
-      map.put(prioritySetField,null);
+      map.put(prioritySetField,new Long(0L));
       break;
     case STATUS_ACTIVENEEDRESCAN:
     case STATUS_ACTIVENEEDRESCANPURGATORY:



Mime
View raw message