You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by tb...@apache.org on 2015/09/28 17:26:38 UTC
svn commit: r1705707 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Author: tboehme
Date: Mon Sep 28 15:26:38 2015
New Revision: 1705707
URL: http://svn.apache.org/viewvc?rev=1705707&view=rev
Log:
PDFBOX-2883: use ScratchFile in COSStream in every case
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java?rev=1705707&r1=1705706&r2=1705707&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java Mon Sep 28 15:26:38 2015
@@ -24,11 +24,11 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.RandomAccess;
-import org.apache.pdfbox.io.RandomAccessBuffer;
import org.apache.pdfbox.io.RandomAccessInputStream;
import org.apache.pdfbox.io.RandomAccessOutputStream;
import org.apache.pdfbox.io.ScratchFile;
@@ -49,8 +49,7 @@ public class COSStream extends COSDictio
*/
public COSStream()
{
- this.randomAccess = new RandomAccessBuffer();
- this.scratchFile = null;
+ this(ScratchFile.getMainMemoryOnlyInstance());
}
/**
@@ -62,7 +61,7 @@ public class COSStream extends COSDictio
{
super();
this.randomAccess = createRandomAccess(scratchFile);
- this.scratchFile = scratchFile;
+ this.scratchFile = scratchFile != null ? scratchFile : ScratchFile.getMainMemoryOnlyInstance();
}
/**
@@ -70,21 +69,14 @@ public class COSStream extends COSDictio
*/
private RandomAccess createRandomAccess(ScratchFile scratchFile)
{
- if (scratchFile != null)
+ try
{
- try
- {
- return scratchFile.createBuffer();
- }
- catch (IOException e)
- {
- // user can't recover from this exception anyway
- throw new RuntimeException(e);
- }
+ return scratchFile.createBuffer();
}
- else
+ catch (IOException e)
{
- return new RandomAccessBuffer();
+ // user can't recover from this exception anyway
+ throw new RuntimeException(e);
}
}