inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ALF-4676: WorkProviderIterator over BatchProcessWorkProvider does not fetch all results

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-07 14:10:59 +00:00
parent 9e87100a6b
commit 494db3841a
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/java/org/alfresco/repo/batch/BatchProcessor.java
View File

@@ -24,6 +24,7 @@ import java.io.Writer;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -141,13 +142,23 @@ public class BatchProcessor<T> implements BatchMonitor
retryingTransactionHelper,
new BatchProcessWorkProvider<T>()
{
boolean hasMore = true;
public int getTotalEstimatedWorkSize()
{
return collection.size();
}
public Collection<T> getNextWork()
{
return collection;
// Only return the collection once
if (hasMore)
{
hasMore = false;
return collection;
}
else
{
return Collections.emptyList();
}
}
},
workerThreads, batchSize,
@@ -541,27 +552,44 @@ public class BatchProcessor<T> implements BatchMonitor
public boolean hasNext()
{
if (currentIterator == null)
boolean hasNext = false;
if (workProvider == null)
{
if (workProvider != null)
// The workProvider was exhausted
hasNext = false;
}
else
{
if (currentIterator != null)
{
// See if there there is any more on this specific iterator
hasNext = currentIterator.hasNext();
}
// If we don't have a next (remember that the workProvider is still available)
// go and get more results
if (!hasNext)
{
Collection<T> nextWork = workProvider.getNextWork();
if (nextWork == null)
{
throw new RuntimeException("BatchProcessWorkProvider returned 'null' work: " + workProvider);
}
currentIterator = nextWork.iterator();
// Check that there are some results at all
if (nextWork.size() == 0)
{
// An empty collection indicates that there are no more results
workProvider = null;
currentIterator = null;
hasNext = false;
}
else
{
// There were some results, so get a new iterator
currentIterator = nextWork.iterator();
hasNext = currentIterator.hasNext();
}
}
else
{
// The null workProvider indicates that it was exhausted
}
}
boolean hasNext = (currentIterator == null) ? false : currentIterator.hasNext();
if (!hasNext)
{
workProvider = null; // No more work to get
currentIterator = null;
}
return hasNext;
}