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 2020/09/27 08:45:43 UTC
svn commit: r1882059 -
/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
Author: tilman
Date: Sun Sep 27 08:45:43 2020
New Revision: 1882059
URL: http://svn.apache.org/viewvc?rev=1882059&view=rev
Log:
PDFBOX-4971: avoid NPE
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java?rev=1882059&r1=1882058&r2=1882059&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java Sun Sep 27 08:45:43 2020
@@ -297,7 +297,7 @@ public class StreamPane implements Actio
{
return document;
}
- return getDocument(stream.getStream(filterKey), encoding);
+ return getDocument(inputStream, encoding);
}
return getDocument(inputStream, encoding);
}
@@ -341,7 +341,10 @@ public class StreamPane implements Actio
// CR is not displayed in the raw view (see file from PDFBOX-4964),
// but LF is displayed, so lets first replace CR LF with LF and then
// replace the remaining CRs with LF
- data = data.replace("\r\n", "\n").replace('\r', '\n');
+ if (data != null)
+ {
+ data = data.replace("\r\n", "\n").replace('\r', '\n');
+ }
try
{