Author: bodewig Date: Fri Jan 9 17:37:26 2015 New Revision: 1650609 URL: http://svn.apache.org/r1650609 Log: use for loop rather than iterator
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1650609&r1=1650608&r2=1650609&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Fri Jan 9 17:37:26 2015 @@ -27,7 +27,6 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.util.Calendar; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -448,20 +447,16 @@ public class ZipArchiveOutputStream exte private void writeCentralDirectoryInChunks() throws IOException { int NUM_PER_WRITE = 1000; ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(70 * NUM_PER_WRITE); - Iterator<ZipArchiveEntry> iterator = entries.iterator(); - ZipArchiveEntry ze; int count = 0; - while (iterator.hasNext()){ - ze = iterator.next(); + for (ZipArchiveEntry ze : entries) { byteArrayOutputStream.write(createCentralFileHeader(ze)); - count++; - if (count > NUM_PER_WRITE){ - writeCounted( byteArrayOutputStream.toByteArray()); + if (++count > NUM_PER_WRITE){ + writeCounted(byteArrayOutputStream.toByteArray()); byteArrayOutputStream.reset(); count = 0; } } - writeCounted( byteArrayOutputStream.toByteArray()); + writeCounted(byteArrayOutputStream.toByteArray()); } /**