[#1730] Fix NPE in generated from RNC (#1769)

Co-authored-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 9, 2024 · a2224db · a2224db
1 parent dde82c2
commit a2224db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -35,6 +35,9 @@
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/737">#737</link>: xjc:javaType does not handle generic types
                     </para></listitem>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1730">#1730</link>: Error while parsing rnc
+                    </para></listitem>
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1783">#1783</link>: Dependency Exclusion for stax-ex in jaxb-bom is incompatible with dependency:analyze-dep-mgt
                     </para></listitem>

diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011
+ * Copyright (C) 2004-2024
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -192,7 +192,7 @@ public ElementAnnotationBuilder makeElementAnnotationBuilder(String ns, String l
     }
 
     public CommentListImpl makeCommentList() {
-        return null;
+        return new CommentListImpl();
     }
 
     public DPattern makeErrorPattern() {