You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2014/08/16 16:46:57 UTC
svn commit: r1618369 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
Author: msahyoun
Date: Sat Aug 16 14:46:57 2014
New Revision: 1618369
URL: http://svn.apache.org/r1618369
Log:
PDFBOX-2271: Avoid potential NPE in PDAppearanceString.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java?rev=1618369&r1=1618368&r2=1618369&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java Sat Aug 16 14:46:57 2014
@@ -145,9 +145,9 @@ public final class PDAppearanceString
*
* @return The tokens in the original appearance stream
*/
- private List getStreamTokens( PDAppearanceStream appearanceStream ) throws IOException
+ private List<Object> getStreamTokens( PDAppearanceStream appearanceStream ) throws IOException
{
- List tokens = null;
+ List<Object> tokens = new ArrayList<Object>();
if( appearanceStream != null )
{
tokens = getStreamTokens( appearanceStream.getStream() );
@@ -155,11 +155,11 @@ public final class PDAppearanceString
return tokens;
}
- private List getStreamTokens( COSString string ) throws IOException
+ private List<Object> getStreamTokens( COSString string ) throws IOException
{
PDFStreamParser parser;
- List tokens = null;
+ List<Object> tokens = new ArrayList<Object>();
if( string != null )
{
ByteArrayInputStream stream = new ByteArrayInputStream( string.getBytes() );
@@ -170,11 +170,11 @@ public final class PDAppearanceString
return tokens;
}
- private List getStreamTokens( COSStream stream ) throws IOException
+ private List<Object> getStreamTokens( COSStream stream ) throws IOException
{
PDFStreamParser parser;
- List tokens = null;
+ List<Object> tokens = new ArrayList<Object>();
if( stream != null )
{
parser = new PDFStreamParser( stream );
@@ -186,12 +186,14 @@ public final class PDAppearanceString
/**
* Tests if the apperance stream already contains content.
+ *
+ * @param streamTokens individual tokens within the appearance stream
*
* @return true if it contains any content
*/
- private boolean containsMarkedContent( List stream )
+ private boolean containsMarkedContent( List<Object> streamTokens )
{
- return stream.contains( Operator.getOperator("BMC") );
+ return streamTokens.contains( Operator.getOperator("BMC") );
}
/**