You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2004/09/20 23:33:31 UTC

cvs commit: xml-security/src/org/apache/xml/security/transforms/implementations TransformC14NExclusiveWithComments.java

raul        2004/09/20 14:33:31

  Modified:    src/org/apache/xml/security/transforms/implementations
                        TransformC14NExclusiveWithComments.java
  Log:
  Code clean-up.
  
  Revision  Changes    Path
  1.7       +7 -6      xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
  
  Index: TransformC14NExclusiveWithComments.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TransformC14NExclusiveWithComments.java	3 Aug 2004 18:01:20 -0000	1.6
  +++ TransformC14NExclusiveWithComments.java	20 Sep 2004 21:33:31 -0000	1.7
  @@ -19,6 +19,7 @@
   
   
   import java.io.IOException;
  +import java.util.Set;
   
   import javax.xml.parsers.ParserConfigurationException;
   
  @@ -109,14 +110,14 @@
            							excl));
            		
            	}
  -            if (inclusiveNamespaces == null) {
  -               return new XMLSignatureInput(c14n
  -                  .engineCanonicalizeXPathNodeSet(input.getNodeSet()));
  +            String inclusiveNamespacesS=null;
  +            if (inclusiveNamespaces != null) {
  +                inclusiveNamespacesS=inclusiveNamespaces.getInclusiveNamespaces();
               } 
  +            
                  return new XMLSignatureInput(c14n
  -                  .engineCanonicalizeXPathNodeSet(input
  -                     .getNodeSet(), inclusiveNamespaces
  -                     .getInclusiveNamespaces()));
  +                  .engineCanonicalizeXPathNodeSet(input.getNodeSet()
  +                     , inclusiveNamespacesS));
               
            
         } catch (IOException ex) {