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 2005/04/03 13:30:33 UTC

cvs commit: xml-security/src/org/apache/xml/security/signature Reference.java XMLSignature.java

raul        2005/04/03 04:30:33

  Modified:    src/org/apache/xml/security/signature Reference.java
                        XMLSignature.java
  Log:
  Use the new unsync output stream
  
  Revision  Changes    Path
  1.41      +2 -2      xml-security/src/org/apache/xml/security/signature/Reference.java
  
  Index: Reference.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/Reference.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Reference.java	2 Apr 2005 18:44:13 -0000	1.40
  +++ Reference.java	3 Apr 2005 11:30:33 -0000	1.41
  @@ -19,7 +19,6 @@
   
   
   
  -import java.io.BufferedOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.util.HashSet;
  @@ -40,6 +39,7 @@
   import org.apache.xml.security.utils.DigesterOutputStream;
   import org.apache.xml.security.utils.IdResolver;
   import org.apache.xml.security.utils.SignatureElementProxy;
  +import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
   import org.apache.xml.security.utils.XMLUtils;
   import org.apache.xml.security.utils.resolver.ResourceResolver;
   import org.apache.xml.security.utils.resolver.ResourceResolverException;
  @@ -684,7 +684,7 @@
   
            mda.reset();
            DigesterOutputStream diOs=new DigesterOutputStream(mda);
  -         OutputStream os=new BufferedOutputStream(diOs);
  +         OutputStream os=new UnsyncBufferedOutputStream(diOs);
            XMLSignatureInput output=this.dereferenceURIandPerformTransforms(os);         
            output.updateOutputStream(os);
            os.flush();
  
  
  
  1.43      +3 -3      xml-security/src/org/apache/xml/security/signature/XMLSignature.java
  
  Index: XMLSignature.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/XMLSignature.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- XMLSignature.java	2 Apr 2005 18:48:37 -0000	1.42
  +++ XMLSignature.java	3 Apr 2005 11:30:33 -0000	1.43
  @@ -18,7 +18,6 @@
   
   
   
  -import java.io.BufferedOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.security.Key;
  @@ -42,6 +41,7 @@
   import org.apache.xml.security.utils.IdResolver;
   import org.apache.xml.security.utils.SignatureElementProxy;
   import org.apache.xml.security.utils.SignerOutputStream;
  +import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
   import org.apache.xml.security.utils.XMLUtils;
   import org.apache.xml.security.utils.resolver.ResourceResolver;
   import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
  @@ -496,7 +496,7 @@
   
               // generate digest values for all References in this SignedInfo
               si.generateDigestValues();
  -            OutputStream so=new BufferedOutputStream(new SignerOutputStream(sa));
  +            OutputStream so=new UnsyncBufferedOutputStream(new SignerOutputStream(sa));
               try {
                   so.close();
               } catch (IOException e) {
  @@ -607,7 +607,7 @@
   
            // Get the canonicalized (normalized) SignedInfo
            SignerOutputStream so=new SignerOutputStream(sa);
  -         BufferedOutputStream bos=new BufferedOutputStream(so);
  +         OutputStream bos=new UnsyncBufferedOutputStream(so);
            this._signedInfo.signInOctectStream(bos);
            try {
   			bos.close();