Author: tilman
Date: Fri Feb 26 19:16:46 2021
New Revision: 1886957
URL: http://svn.apache.org/viewvc?rev=1886957&view=rev
Log:
PDFBOX-5110: SonarQube fix; readability improvement
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/COSFilterInputStream.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/COSFilterInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/COSFilterInputStream.java?rev=1886957&r1=1886956&r2=1886957&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/COSFilterInputStream.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/COSFilterInputStream.java Fri Feb 26 19:16:46 2021
@@ -49,12 +49,9 @@ public class COSFilterInputStream extend
@Override
public int read() throws IOException
{
- if (this.range == -1 || getRemaining() <= 0)
+ if ((this.range == -1 || getRemaining() <= 0) && !nextRange())
{
- if (!nextRange())
- {
- return -1; // EOF
- }
+ return -1; // EOF
}
int result = super.read();
this.position++;
@@ -70,12 +67,9 @@ public class COSFilterInputStream extend
@Override
public int read(byte[] b, int off, int len) throws IOException
{
- if (this.range == -1 || getRemaining() <= 0)
+ if ((this.range == -1 || getRemaining() <= 0) && !nextRange())
{
- if (!nextRange())
- {
- return -1; // EOF
- }
+ return -1; // EOF
}
int bytesRead = super.read(b, off, (int) Math.min(len, getRemaining()));
this.position += bytesRead;
@@ -104,7 +98,7 @@ public class COSFilterInputStream extend
private boolean nextRange() throws IOException
{
- if (this.ranges.length > this.range + 1)
+ if (this.range + 1 < this.ranges.length)
{
this.range++;
while (this.position < this.ranges[this.range][0])