Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DigestUtils processes InputStream with buffered read instead of full copy

Browse Source 
Issue: SPR-14427
This commit is contained in:
Juergen Hoeller
2016-07-08 12:20:49 +02:00
parent 2bf9bc312e
commit 61db8e9f1e
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-core/src/main/java/org/springframework/util/DigestUtils.java
View File

@@ -23,11 +23,13 @@ import java.security.NoSuchAlgorithmException;
/**
* Miscellaneous methods for calculating digests.
*
* <p>Mainly for internal use within the framework; consider
* <a href="http://commons.apache.org/codec/">Apache Commons Codec</a>
* for a more comprehensive suite of digest utilities.
*
* @author Arjen Poutsma
* @author Juergen Hoeller
* @author Craig Andrews
* @since 3.0
*/
@@ -49,8 +51,8 @@ public abstract class DigestUtils {
}
/**
* Calculate the MD5 digest of the given InputStream.
* @param inputStream the inputStream to calculate the digest over
* Calculate the MD5 digest of the given stream.
* @param inputStream the InputStream to calculate the digest over
* @return the digest
* @since 4.2
*/
@@ -59,8 +61,7 @@ public abstract class DigestUtils {
}
/**
* Return a hexadecimal string representation of the MD5 digest of the given
* bytes.
* Return a hexadecimal string representation of the MD5 digest of the given bytes.
* @param bytes the bytes to calculate the digest over
* @return a hexadecimal digest string
*/
@@ -69,9 +70,8 @@ public abstract class DigestUtils {
}
/**
* Return a hexadecimal string representation of the MD5 digest of the given
* inputStream.
* @param inputStream the inputStream to calculate the digest over
* Return a hexadecimal string representation of the MD5 digest of the given stream.
* @param inputStream the InputStream to calculate the digest over
* @return a hexadecimal digest string
* @since 4.2
*/
@@ -127,7 +127,12 @@ public abstract class DigestUtils {
return messageDigest.digest();
}
else {
return messageDigest.digest(StreamUtils.copyToByteArray(inputStream));
final byte[] buffer = new byte[StreamUtils.BUFFER_SIZE];
int bytesRead = -1;
while ((bytesRead = inputStream.read(buffer)) != -1) {
messageDigest.update(buffer, 0, bytesRead);
}
return messageDigest.digest();
}
}