From c35541128382acea6be82ad31786d906fe9572b1 Mon Sep 17 00:00:00 2001 From: Jan van Mansum Date: Mon, 23 Mar 2026 16:00:55 +0100 Subject: [PATCH 1/2] Guard against NPE --- .../java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java index feccac5c908..e587be4c671 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java @@ -938,7 +938,7 @@ private String generateInfoFile() { info.append(CRLF); } else { - if (contactNameTerm != null) { + if (contactNameTerm != null && ((JsonObject) person).has(contactNameTerm.getLabel())) { info.append(multilineWrap(CONTACT_NAME + ((JsonObject) person).get(contactNameTerm.getLabel()).getAsString())); info.append(CRLF); } From 96dbff481fdd6e6182dad22ba8707dcaaea3843a Mon Sep 17 00:00:00 2001 From: Jan van Mansum Date: Thu, 26 Mar 2026 16:57:40 +0100 Subject: [PATCH 2/2] Release note --- doc/release-notes/12246-guard-npe-bag-generator.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/release-notes/12246-guard-npe-bag-generator.md diff --git a/doc/release-notes/12246-guard-npe-bag-generator.md b/doc/release-notes/12246-guard-npe-bag-generator.md new file mode 100644 index 00000000000..12069a8fcec --- /dev/null +++ b/doc/release-notes/12246-guard-npe-bag-generator.md @@ -0,0 +1 @@ +Fixed a problem in the BagPack generator, which caused the export to fail for datasets with multiple Contact Points, of which some had no name while others did. \ No newline at end of file