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 2018/02/01 16:09:24 UTC

svn commit: r1822888 - in /santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl: stax/XMLSecStartDocumentImpl.java transformer/TransformBase64Decode.java transformer/canonicalizer/CanonicalizerBase.java

Author: coheigea
Date: Thu Feb  1 16:09:24 2018
New Revision: 1822888

URL: http://svn.apache.org/viewvc?rev=1822888&view=rev
Log:
Some trivial cleanup

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java?rev=1822888&r1=1822887&r2=1822888&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java Thu Feb  1 16:09:24 2018
@@ -63,7 +63,7 @@ public class XMLSecStartDocumentImpl ext
 
     @Override
     public boolean isStandalone() {
-        return isStandAlone != null ? isStandAlone : false;
+        return isStandAlone != null && isStandAlone;
     }
 
     @Override

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java?rev=1822888&r1=1822887&r2=1822888&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java Thu Feb  1 16:09:24 2018
@@ -97,7 +97,7 @@ public class TransformBase64Decode exten
                                             base64OutputStream = new Base64OutputStream(byteArrayOutputStream, false);
                                         }
                                         try {
-                                            base64OutputStream.write(((byte[]) object));
+                                            base64OutputStream.write((byte[]) object);
                                         } catch (IOException e) {
                                             throw new XMLStreamException(e);
                                         }
@@ -142,7 +142,7 @@ public class TransformBase64Decode exten
                                             base64OutputStream = new Base64OutputStream(byteArrayOutputStream, false);
                                         }
                                         try {
-                                            base64OutputStream.write(((byte[]) object));
+                                            base64OutputStream.write((byte[]) object);
                                         } catch (IOException e) {
                                             throw new XMLStreamException(e);
                                         }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1822888&r1=1822887&r2=1822888&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Thu Feb  1 16:09:24 2018
@@ -326,7 +326,7 @@ public abstract class CanonicalizerBase
 
                     break;
                 case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                    outputPItoWriter(((XMLSecProcessingInstruction) xmlSecEvent), outputStream, currentDocumentLevel);
+                    outputPItoWriter((XMLSecProcessingInstruction) xmlSecEvent, outputStream, currentDocumentLevel);
                     break;
                 case XMLStreamConstants.CHARACTERS:
                     if (currentDocumentLevel == DocumentLevel.NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT) {
@@ -335,7 +335,7 @@ public abstract class CanonicalizerBase
                     break;
                 case XMLStreamConstants.COMMENT:
                     if (includeComments) {
-                        outputCommentToWriter(((XMLSecComment) xmlSecEvent), outputStream, currentDocumentLevel);
+                        outputCommentToWriter((XMLSecComment) xmlSecEvent, outputStream, currentDocumentLevel);
                     }
                     break;
                 case XMLStreamConstants.SPACE: