Author: kwright
Date: Tue Nov 19 06:54:18 2013
New Revision: 1543317
URL: http://svn.apache.org/r1543317
Log:
setStatus no longer needs to take a generic status
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1543317&r1=1543316&r2=1543317&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Tue Nov 19 06:54:18 2013
@@ -3284,7 +3284,7 @@ public class JobManager implements IJobM
i = 0;
while (i < ids.length)
{
-
jobQueue.setStatus(ids[i],jobQueue.STATUS_PENDINGPURGATORY,executeTimesNew[i],actionsNew[i],-1L,-1);
+
jobQueue.setRequeuedStatus(ids[i],executeTimesNew[i],actionsNew[i],-1L,-1);
i++;
}
@@ -3411,7 +3411,7 @@ public class JobManager implements IJobM
i = 0;
while (i < ids.length)
{
-
jobQueue.setStatus(ids[i],jobQueue.STATUS_PENDINGPURGATORY,executeTimes[i],actions[i],(failTimes==null)?-1L:failTimes[i],(failCounts==null)?-1:failCounts[i]);
+
jobQueue.setRequeuedStatus(ids[i],executeTimes[i],actions[i],(failTimes==null)?-1L:failTimes[i],(failCounts==null)?-1:failCounts[i]);
i++;
}
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1543317&r1=1543316&r2=1543317&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Tue Nov 19 06:54:18 2013
@@ -950,17 +950,15 @@ public class JobQueue extends org.apache
}
/** Set the status on a record, including check time and priority.
- * The status set MUST be a PENDING or PENDINGPURGATORY status.
*@param id is the job queue id.
- *@param status is the desired status
*@param checkTime is the check time.
*/
- public void setStatus(Long id, int status,
+ public void setRequeuedStatus(Long id,
Long checkTime, int action, long failTime, int failCount)
throws ManifoldCFException
{
HashMap map = new HashMap();
- map.put(statusField,statusToString(status));
+ map.put(statusField,statusToString(STATUS_PENDINGPURGATORY));
map.put(processIDField,null);
map.put(checkTimeField,checkTime);
map.put(checkActionField,actionToString(action));
@@ -979,7 +977,7 @@ public class JobQueue extends org.apache
new UnitaryClause(idField,id)});
performUpdate(map,"WHERE "+query,list,null);
noteModifications(0,1,0);
- TrackerClass.noteRecordChange(id, status, "Set status");
+ TrackerClass.noteRecordChange(id, STATUS_PENDINGPURGATORY, "Set requeued
status");
}
/** Set the status of a document to "being deleted".
