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 2012/09/20 11:13:00 UTC
svn commit: r1387924 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature:
Reference.java XMLSignatureInput.java
Author: coheigea
Date: Thu Sep 20 09:12:59 2012
New Revision: 1387924
URL: http://svn.apache.org/viewvc?rev=1387924&view=rev
Log:
[SANTUARIO-344] - Explicitly close OctetStreamReal InputStream in Reference.calculateDigest
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1387924&r1=1387923&r2=1387924&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Thu Sep 20 09:12:59 2012
@@ -428,7 +428,7 @@ public class Reference extends Signature
XMLSignatureInput output = null;
if (transforms != null) {
- output = transforms.performTransforms(input,os);
+ output = transforms.performTransforms(input, os);
this.transformsOutput = output;//new XMLSignatureInput(output.getBytes());
//this.transformsOutput.setSourceURI(output.getSourceURI());
@@ -702,6 +702,11 @@ public class Reference extends Signature
output.updateOutputStream(os);
}
os.flush();
+
+ if (output.getOctetStreamReal() != null) {
+ output.getOctetStreamReal().close();
+ }
+
//this.getReferencedBytes(diOs);
//mda.update(data);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1387924&r1=1387923&r2=1387924&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Thu Sep 20 09:12:59 2012
@@ -252,7 +252,7 @@ public class XMLSignatureInput {
/**
* @return real octet stream
*/
- public InputStream getOctetStreamReal () {
+ public InputStream getOctetStreamReal() {
return inputOctetStreamProxy;
}