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 2022/04/22 11:28:43 UTC
svn commit: r1900147 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
Author: tilman
Date: Fri Apr 22 11:28:43 2022
New Revision: 1900147
URL: http://svn.apache.org/viewvc?rev=1900147&view=rev
Log:
PDFBOX-4892: remove unneeded null check, as suggested by Valery Bokov
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java?rev=1900147&r1=1900146&r2=1900147&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java Fri Apr 22 11:28:43 2022
@@ -207,29 +207,26 @@ public class PDStream implements COSObje
InputStream is = stream.createRawInputStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
List<COSName> filters = getFilters();
- if (filters != null)
+ for (int i = 0; i < filters.size(); i++)
{
- for (int i = 0; i < filters.size(); i++)
+ COSName nextFilter = filters.get(i);
+ if ((stopFilters != null) && stopFilters.contains(nextFilter.getName()))
{
- COSName nextFilter = filters.get(i);
- if ((stopFilters != null) && stopFilters.contains(nextFilter.getName()))
+ break;
+ }
+ else
+ {
+ Filter filter = FilterFactory.INSTANCE.getFilter(nextFilter);
+ try
{
- break;
+ filter.decode(is, os, stream, i);
}
- else
+ finally
{
- Filter filter = FilterFactory.INSTANCE.getFilter(nextFilter);
- try
- {
- filter.decode(is, os, stream, i);
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
- is = new ByteArrayInputStream(os.toByteArray());
- os.reset();
+ IOUtils.closeQuietly(is);
}
+ is = new ByteArrayInputStream(os.toByteArray());
+ os.reset();
}
}
return is;