Skip to content

Commit

Permalink
Fix regressions introduced by #1715
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
lukasj committed Oct 6, 2023
1 parent 57ebae1 commit 2269a1d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,21 @@
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1708">#1708</link>: add javadoc from xsd documentation tags
</para></listitem>
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1724">#1724</link>: JAXBContext having defaultNamespaceRemap after release 4.0.3 produces unexpected xml
</para></listitem>
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1731">#1731</link>: Incompatibility with namespace when marshalling WebFault with FaultInfo on call of WebService
</para></listitem>
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1736">#1736</link>: xjc: postProcessModel is not called for DTDs
</para></listitem>
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1737">#1737</link>: Add https to special handling in package name derivation
</para></listitem>
<listitem><para>
<link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1742">#1742</link>: Unexpected form=qualified Attribute in XSD Elements
</para></listitem>
</itemizedlist>
</para></listitem>
</itemizedlist>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -350,7 +350,7 @@ private QName calcXmlName(String uri,String local) {
uri = "";
}
} else {
uri = parent.builder.defaultNsUri;
uri = "";

This comment has been minimized.

Copy link
@MaximValeev

MaximValeev Dec 20, 2023

why you set "" instead of parent.builder.defaultNsUri here? For now all nested elements don't inherit parent's namespace.

}
}
return new QName(uri.intern(),local.intern());
Expand Down

This file was deleted.

0 comments on commit 2269a1d

Please sign in to comment.