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 2015/01/11 19:05:58 UTC
svn commit: r1650936 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
Author: msahyoun
Date: Sun Jan 11 18:05:58 2015
New Revision: 1650936
URL: http://svn.apache.org/r1650936
Log:
PDFBOX-2516 handle null when setting inheritable attributes
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java?rev=1650936&r1=1650935&r2=1650936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Sun Jan 11 18:05:58 2015
@@ -141,14 +141,21 @@ public abstract class PDFieldTreeNode im
*/
protected void setInheritableAttribute(COSName key, COSBase value)
{
- PDFieldTreeNode attributesNode = getInheritableAttributesNode(this,key);
- if (attributesNode != null)
+ if (value == null)
{
- attributesNode.getDictionary().setItem(key, value);
+ removeInheritableAttribute(key);
}
- else
+ else
{
- getDictionary().setItem(key, value);
+ PDFieldTreeNode attributesNode = getInheritableAttributesNode(this,key);
+ if (attributesNode != null)
+ {
+ attributesNode.getDictionary().setItem(key, value);
+ }
+ else
+ {
+ getDictionary().setItem(key, value);
+ }
}
}