You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2020/10/19 08:36:54 UTC
[santuario-xml-security-java] branch master updated: More code fixup
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
The following commit(s) were added to refs/heads/master by this push:
new d80d9dc More code fixup
d80d9dc is described below
commit d80d9dc4ca472d13776d67aa2960f4036b49786e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Oct 19 09:32:30 2020 +0100
More code fixup
---
.../apache/xml/security/stax/impl/transformer/TransformIdentity.java | 1 +
src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
index 6f9da31..c77f531 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
@@ -55,6 +55,7 @@ public class TransformIdentity implements Transformer {
synchronized(TransformIdentity.class) {
if (xmlInputFactory == null) {
xmlInputFactory = XMLInputFactory.newInstance();
+ xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
xmlInputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", false);
}
}
diff --git a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
index 2fb2cae..91305b8 100644
--- a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
+++ b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
@@ -125,9 +125,9 @@ public class DOMNamespaceContext implements NamespaceContext {
}
if (namespaceURI == null && context != null) {
return context.lookupNamespaceURI(null) != null ? null : DEFAULT_NS_PREFIX;
- } else if (namespaceURI.equals(XML_NS_URI)) {
+ } else if (XML_NS_URI.equals(namespaceURI)) {
return XML_NS_PREFIX;
- } else if (namespaceURI.equals(XMLNS_ATTRIBUTE_NS_URI)) {
+ } else if (XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI)) {
return XMLNS_ATTRIBUTE;
}
return null;