Merge pull request #4352 from hmlnarik/KEYCLOAK-4788-FormattingXMLStreamWriter-java-reversed-arguments
KEYCLOAK-4788 Fix reversed arguments and String comparison
This commit is contained in:
commit
0406d6738f
1 changed files with 5 additions and 5 deletions
|
@ -81,7 +81,7 @@ public final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter,
|
|||
public void writeStartElement(final String localName) throws XMLStreamException {
|
||||
ArrayDeque<String> namespaces = unspecifiedNamespaces;
|
||||
String namespace = namespaces.getFirst();
|
||||
if (namespace != NO_NAMESPACE) {
|
||||
if (namespace == null ? NO_NAMESPACE != null : ! namespace.equals(NO_NAMESPACE)) {
|
||||
writeStartElement(namespace, localName);
|
||||
return;
|
||||
}
|
||||
|
@ -140,9 +140,9 @@ public final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter,
|
|||
attrQueue.add(new ArgRunnable() {
|
||||
public void run(int arg) throws XMLStreamException {
|
||||
if (arg == 0) {
|
||||
delegate.writeStartElement(prefix, namespaceURI, localName);
|
||||
delegate.writeStartElement(prefix, localName, namespaceURI);
|
||||
} else {
|
||||
delegate.writeEmptyElement(prefix, namespaceURI, localName);
|
||||
delegate.writeEmptyElement(prefix, localName, namespaceURI);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -165,14 +165,14 @@ public final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter,
|
|||
runAttrQueue();
|
||||
nl();
|
||||
indent();
|
||||
delegate.writeEmptyElement(prefix, namespaceURI, localName);
|
||||
delegate.writeEmptyElement(prefix, localName, namespaceURI);
|
||||
state = END_ELEMENT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeEmptyElement(final String localName) throws XMLStreamException {
|
||||
String namespace = unspecifiedNamespaces.getFirst();
|
||||
if (namespace != NO_NAMESPACE) {
|
||||
if (namespace == null ? NO_NAMESPACE != null : ! namespace.equals(NO_NAMESPACE)) {
|
||||
writeEmptyElement(namespace, localName);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue