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/15 06:09:35 UTC

[santuario-xml-security-java] branch master updated: Fixing a few more instances of empty string comparison

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 29dd965  Fixing a few more instances of empty string comparison
29dd965 is described below

commit 29dd965d55d66fc8849744add3405bdf7f90f96f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 15 07:08:51 2020 +0100

    Fixing a few more instances of empty string comparison
---
 .../org/apache/xml/security/c14n/implementations/CanonicalizerBase.java | 2 +-
 .../apache/xml/security/c14n/implementations/NameSpaceSymbTable.java    | 2 +-
 .../java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
index 8af68fb..06852a2 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
@@ -556,7 +556,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
         }
         parents.clear();
         Attr nsprefix = ns.getMappingWithoutRendered(XMLNS);
-        if (nsprefix != null && "".equals(nsprefix.getValue())) {
+        if (nsprefix != null && nsprefix.getValue().length() == 0) {
             ns.addMappingAndRender(
                     XMLNS, "", getNullNode(nsprefix.getOwnerDocument()));
         }
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
index 0df755b..8a730ff 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
@@ -344,7 +344,7 @@ class SymbMap implements Cloneable {
     List<NameSpaceSymbEntry> entrySet() {
         List<NameSpaceSymbEntry> a = new ArrayList<>();
         for (int i = 0;i < entries.length;i++) {
-            if (entries[i] != null && !"".equals(entries[i].uri)) {
+            if (entries[i] != null && entries[i].uri.length() != 0) {
                 a.add(entries[i]);
             }
         }
diff --git a/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
index 32374d2..d4ad4ab 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
@@ -138,7 +138,7 @@ public abstract class AbstractOutputProcessor implements OutputProcessor {
             xmlSecStartElement.addAttribute(xmlSecAttribute);
 
             final QName attributeName = xmlSecAttribute.getName();
-            if (attributeName.getNamespaceURI() != null && !"".equals(attributeName.getNamespaceURI())
+            if (attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() != 0
                 && !declaredNamespaces.contains(xmlSecAttribute.getAttributeNamespace())) {
                 xmlSecStartElement.addNamespace(xmlSecAttribute.getAttributeNamespace());
             }