moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix questionable List.remove(int) in SXSSFITestDataProvider

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1725042 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-01-16 22:23:05 +00:00
parent 94fdd517aa
commit 18c5045d5b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
View File

@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.Collection;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.ITestDataProvider;
@ -43,7 +43,7 @@ public final class SXSSFITestDataProvider implements ITestDataProvider {
// an instance of all SXSSFWorkbooks opened by this TestDataProvider, // an instance of all SXSSFWorkbooks opened by this TestDataProvider,
// so that the temporary files created can be disposed up by cleanup() // so that the temporary files created can be disposed up by cleanup()
private final List<SXSSFWorkbook> instances = new ArrayList<SXSSFWorkbook>(); private final Collection<SXSSFWorkbook> instances = new ArrayList<SXSSFWorkbook>();
private SXSSFITestDataProvider() { private SXSSFITestDataProvider() {
// enforce singleton // enforce singleton
@ -107,11 +107,10 @@ public final class SXSSFITestDataProvider implements ITestDataProvider {
public synchronized boolean cleanup(){ public synchronized boolean cleanup(){
boolean ok = true; boolean ok = true;
for(int i = 0; i < instances.size(); i++){ for(final SXSSFWorkbook wb : instances) {
SXSSFWorkbook wb = instances.get(i);
ok = ok && wb.dispose(); ok = ok && wb.dispose();
instances.remove(i);
} }
instances.clear();
return ok; return ok;
} }
} }