You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/08/03 16:48:10 UTC
svn commit: r1804018 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Author: tilman
Date: Thu Aug 3 16:48:10 2017
New Revision: 1804018
URL: http://svn.apache.org/viewvc?rev=1804018&view=rev
Log:
PDFBOX-2852: refactor
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1804018&r1=1804017&r2=1804018&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Thu Aug 3 16:48:10 2017
@@ -254,15 +254,13 @@ public class PDFMergerUtility
MemoryUsageSetting partitionedMemSetting = memUsageSetting != null ?
memUsageSetting.getPartitionedCopy(sources.size()+1) :
MemoryUsageSetting.setupMainMemoryOnly();
- Iterator<InputStream> sit = sources.iterator();
destination = new PDDocument(partitionedMemSetting);
- while (sit.hasNext())
+ for (InputStream sourceInputStream : sources)
{
- sourceFile = sit.next();
- source = PDDocument.load(sourceFile, partitionedMemSetting);
- tobeclosed.add(source);
- appendDocument(destination, source);
+ PDDocument sourceDoc = PDDocument.load(sourceInputStream, partitionedMemSetting);
+ tobeclosed.add(sourceDoc);
+ appendDocument(destination, sourceDoc);
}
// optionally set meta data