Skip to content

Commit e527553

Browse files
committed
PDFBOX-6009: avoid NPE; improve javadoc
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1925702 13f79535-47bb-0310-9956-ffa450edef68
1 parent 6e8a7a6 commit e527553

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ private void cloneStructureTree(PDDocument destinationDocument) throws IOExcepti
235235
PDNumberTreeNode dstNumberTreeNode = new PDNumberTreeNode(PDParentTreeValue.class);
236236
dstNumberTreeNode.setNumbers(dstNumberTreeAsMap);
237237
dstStructureTreeRoot.setParentTree(dstNumberTreeNode);
238-
dstStructureTreeRoot.setParentTreeNextKey(dstNumberTreeNode.getUpperLimit() + 1);
238+
Integer upperLimit = dstNumberTreeNode.getUpperLimit();
239+
if (upperLimit != null)
240+
{
241+
dstStructureTreeRoot.setParentTreeNextKey(upperLimit + 1);
242+
}
239243
dstStructureTreeRoot.setClassMap(srcStructureTreeRoot.getClassMap());
240244
cloneRoleMap(srcStructureTreeRoot, dstStructureTreeRoot);
241245
cloneIDTree(srcStructureTreeRoot, dstStructureTreeRoot);

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void setNumbers( Map<Integer, ? extends COSObjectable> numbers )
276276
/**
277277
* Get the highest value for a key in the number map.
278278
*
279-
* @return The highest value for a key in the map.
279+
* @return The highest value for a key in the map or null if missing.
280280
*/
281281
public Integer getUpperLimit()
282282
{
@@ -317,7 +317,7 @@ private void setUpperLimit( Integer upper )
317317
/**
318318
* Get the lowest value for a key in the number map.
319319
*
320-
* @return The lowest value for a key in the map.
320+
* @return The lowest value for a key in the map or null if missing.
321321
*/
322322
public Integer getLowerLimit()
323323
{

0 commit comments

Comments
 (0)