aboutsummaryrefslogtreecommitdiffstats
path: root/fop-core
diff options
context:
space:
mode:
authorSimon Steiner <ssteiner@apache.org>2022-07-14 10:41:17 +0000
committerSimon Steiner <ssteiner@apache.org>2022-07-14 10:41:17 +0000
commit92a2c95835e0af0d9e531324a426a5a45073a662 (patch)
treeaf9849f5cc983bee201de225e3f810cc46557b9d /fop-core
parentb063d27e718e0a307f566b483e4e358e81939b05 (diff)
downloadxmlgraphics-fop-92a2c95835e0af0d9e531324a426a5a45073a662.tar.gz
xmlgraphics-fop-92a2c95835e0af0d9e531324a426a5a45073a662.zip
FOP-3082: NPE when using a link in a span with accessibility
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1902716 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop-core')
-rw-r--r--fop-core/src/main/java/org/apache/fop/area/PageViewport.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/area/PageViewport.java b/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
index f1cd95721..a7353d36a 100644
--- a/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
+++ b/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
@@ -284,7 +284,9 @@ public class PageViewport extends AreaTreeObject implements Resolvable {
*/
public void replace(PageViewport oldViewPort) {
this.idFirsts.addAll(oldViewPort.idFirsts);
- this.unresolvedIDRefs.putAll(oldViewPort.unresolvedIDRefs);
+ if (oldViewPort.unresolvedIDRefs != null) {
+ this.unresolvedIDRefs.putAll(oldViewPort.unresolvedIDRefs);
+ }
if (oldViewPort.pendingResolved != null) {
this.pendingResolved.putAll(oldViewPort.pendingResolved);
}