Merge branch 'master' into develop

Signed-off-by: Jarno Elovirta <[email protected]>
pflotscher · May 5, 2024 · 65d164b · 65d164b
2 parents 6872d71 + dac9a31
commit 65d164b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/docsrc b/src/main/docsrc
diff --git a/src/main/java/org/dita/dost/writer/KeyrefPaser.java b/src/main/java/org/dita/dost/writer/KeyrefPaser.java
@@ -211,6 +211,9 @@ public void setKeyDefinition(final KeyScope definitionMap) {
    * Get set of link targets which have normal processing role. Paths are relative to current file.
    */
   public Set<URI> getNormalProcessingRoleTargets() {
+    if (normalProcessingRoleTargets == null) {
+      return Set.of();
+    }
     return Collections.unmodifiableSet(normalProcessingRoleTargets);
   }
+1 −1		.github/actions/render/action.yml
+1 −1		.github/workflows/gradle-wrapper-validation.yml
+1 −1		.github/workflows/release.yml
+7 −7		package-lock.json
+1 −1		package.json
+22 −2		release-notes/index.dita
+1 −1		resources/key-definitions.ditamap
+1 −1		samples/docker/Dockerfile