Merge pull request #601 from veraPDF/parent_elem

Fix getParentStructElem methods
veraPDF · Oct 30, 2023 · 7a1b934 · 7a1b934
2 parents 580f59e + b5dbaa6
commit 7a1b934
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/factory/operators/OperatorParser.java b/validation-model/src/main/java/org/verapdf/gf/model/factory/operators/OperatorParser.java
@@ -695,7 +695,7 @@ private COSObject getParentStructElem(StructureElementAccessObject structureElem
 		if (structTreeRoot != null) {
 			PDNumberTreeNode parentTreeRoot = structTreeRoot.getParentTree();
 			COSObject structureElement = parentTreeRoot == null ? null : structureElementAccessObject.getStructureElement(parentTreeRoot, mcid);
-			if (structureElement != null && !structureElement.empty()) {
+			if (structureElement != null && !structureElement.empty() && structureElement.getType() != COSObjType.COS_NULL) {
 				return structureElement;
 			}
 		}

diff --git a/...dation-model/src/main/java/org/verapdf/gf/model/impl/operator/markedcontent/GFOp_BDC.java b/...dation-model/src/main/java/org/verapdf/gf/model/impl/operator/markedcontent/GFOp_BDC.java
@@ -23,6 +23,7 @@
 import org.verapdf.as.ASAtom;
 import org.verapdf.cos.COSBase;
 import org.verapdf.cos.COSKey;
+import org.verapdf.cos.COSObjType;
 import org.verapdf.cos.COSObject;
 import org.verapdf.exceptions.LoopedException;
 import org.verapdf.gf.model.impl.pd.util.PDResourcesHandler;
@@ -80,7 +81,7 @@ private COSObject getStructElem() {
 		if (structTreeRoot != null && mcid != null) {
 			PDNumberTreeNode parentTreeRoot = structTreeRoot.getParentTree();
 			COSObject structureElement = parentTreeRoot == null ? null : structureElementAccessObject.getStructureElement(parentTreeRoot, mcid);
-			if (structureElement != null && !structureElement.empty()) {
+			if (structureElement != null && !structureElement.empty() && structureElement.getType() != COSObjType.COS_NULL) {
 				return structureElement;
 			}
 		}

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDContentStream.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDContentStream.java
@@ -203,7 +203,7 @@ private COSObject getParentStructureElem(StructureElementAccessObject structureE
 		if (structTreeRoot != null) {
 			PDNumberTreeNode parentTreeRoot = structTreeRoot.getParentTree();
 			COSObject structureElement = parentTreeRoot == null ? null : structureElementAccessObject.getStructureElement(parentTreeRoot, null);
-			if (structureElement != null && !structureElement.empty()) {
+			if (structureElement != null && !structureElement.empty() && structureElement.getType() != COSObjType.COS_NULL) {
 				return structureElement;
 			}
 		}