From d8b77895db0735e83ad53884925db6c55d69384d Mon Sep 17 00:00:00 2001 From: Hynek Mlnarik Date: Thu, 27 Jul 2017 08:25:22 +0200 Subject: [PATCH] KEYCLOAK-4788 Fix reversed arguments and String comparison --- .../saml/as7/xml/FormattingXMLStreamWriter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/xml/FormattingXMLStreamWriter.java b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/xml/FormattingXMLStreamWriter.java index 0d566597b3..2334a63ad7 100644 --- a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/xml/FormattingXMLStreamWriter.java +++ b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/xml/FormattingXMLStreamWriter.java @@ -81,7 +81,7 @@ public final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter, public void writeStartElement(final String localName) throws XMLStreamException { ArrayDeque 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; }