Author: msahyoun
Date: Fri Apr 10 11:33:29 2026
New Revision: 1932957
Log:
PDFBOX-5660: replace null check which doesn't happen
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
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Fri Apr 10 10:14:43 2026 (r1932956)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
Fri Apr 10 11:33:29 2026 (r1932957)
@@ -290,11 +290,10 @@ public class COSStream extends COSDictio
else
randomAccess = getStreamCache().createBuffer();
- OutputStream randomOut = null;
+ OutputStream randomOut = new RandomAccessOutputStream(randomAccess);
try
{
- randomOut = new RandomAccessOutputStream(randomAccess);
FilterOutputStream result = new FilterOutputStream(randomOut)
{
@Override
@@ -318,12 +317,19 @@ public class COSStream extends COSDictio
}
};
isWriting = true;
- randomOut = null; // ownership transferred to result so don't
close it in the finally block
return result;
}
- finally
+ catch (Exception e)
{
- if (randomOut != null) randomOut.close();
+ try
+ {
+ randomOut.close();
+ }
+ catch (IOException closeEx)
+ {
+ e.addSuppressed(closeEx);
+ }
+ throw e;
}
}