From f600ab94d02bd26b1c00b121735044b56016f29c Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Mon, 8 Dec 2025 19:00:30 +0300 Subject: [PATCH 1/2] Fix case when not properly considering missing xmp entry --- .../org/verapdf/gf/model/impl/cos/GFCosInfo.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java index a4fcd523c..04eb23ad0 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java @@ -211,11 +211,14 @@ public Boolean getdoCreationDatesMatch() { } } String creationDate = getCreationDate(); - if (xmpCreateDate != null && creationDate != null) { + if (creationDate == null) { + return null; + } + if (xmpCreateDate != null) { Calendar creationDateCalendar = TypeConverter.parseDate(creationDate); return creationDateCalendar != null && xmpCreateDate.compareTo(creationDateCalendar) == 0; } - return null; + return false; } @Override @@ -228,11 +231,14 @@ public Boolean getdoModDatesMatch() { } } String modDate = getModDate(); - if (xmpModifyDate != null && modDate != null) { + if (modDate == null) { + return null; + } + if (xmpModifyDate != null) { Calendar modDateCalendar = TypeConverter.parseDate(modDate); return modDateCalendar != null && xmpModifyDate.compareTo(modDateCalendar) == 0; } - return null; + return false; } @Override From df3305d9b22c3b723d9d230fe13dc6ed95dc70e2 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Mon, 8 Dec 2025 19:21:20 +0300 Subject: [PATCH 2/2] Update GFCosInfo.java --- .../org/verapdf/gf/model/impl/cos/GFCosInfo.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java index 04eb23ad0..3696a72c9 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosInfo.java @@ -203,6 +203,10 @@ public String getXMPDescription() { @Override public Boolean getdoCreationDatesMatch() { + String creationDate = getCreationDate(); + if (creationDate == null) { + return null; + } Calendar xmpCreateDate = null; if (meta != null) { try { @@ -210,10 +214,6 @@ public Boolean getdoCreationDatesMatch() { } catch (XMPException ignored) { } } - String creationDate = getCreationDate(); - if (creationDate == null) { - return null; - } if (xmpCreateDate != null) { Calendar creationDateCalendar = TypeConverter.parseDate(creationDate); return creationDateCalendar != null && xmpCreateDate.compareTo(creationDateCalendar) == 0; @@ -223,6 +223,10 @@ public Boolean getdoCreationDatesMatch() { @Override public Boolean getdoModDatesMatch() { + String modDate = getModDate(); + if (modDate == null) { + return null; + } Calendar xmpModifyDate = null; if (meta != null) { try { @@ -230,10 +234,6 @@ public Boolean getdoModDatesMatch() { } catch (XMPException ignored) { } } - String modDate = getModDate(); - if (modDate == null) { - return null; - } if (xmpModifyDate != null) { Calendar modDateCalendar = TypeConverter.parseDate(modDate); return modDateCalendar != null && xmpModifyDate.compareTo(modDateCalendar) == 0;