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 2011/10/18 13:20:38 UTC
svn commit: r1185579 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils:
Base64.java JavaUtils.java
Author: coheigea
Date: Tue Oct 18 11:20:37 2011
New Revision: 1185579
URL: http://svn.apache.org/viewvc?rev=1185579&view=rev
Log:
Closing some outputstreams after use
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java?rev=1185579&r1=1185578&r2=1185579&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java Tue Oct 18 11:20:37 2011
@@ -323,16 +323,22 @@ public class Base64 {
public static final byte[] decode(BufferedReader reader)
throws IOException, Base64DecodingException {
- UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
- String line;
-
- while (null != (line = reader.readLine())) {
- byte[] bytes = decode(line);
-
- baos.write(bytes);
+ byte[] retBytes = null;
+ UnsyncByteArrayOutputStream baos = null;
+ try {
+ baos = new UnsyncByteArrayOutputStream();
+ String line;
+
+ while (null != (line = reader.readLine())) {
+ byte[] bytes = decode(line);
+ baos.write(bytes);
+ }
+ retBytes = baos.toByteArray();
+ } finally {
+ baos.close();
}
- return baos.toByteArray();
+ return retBytes;
}
protected static final boolean isWhiteSpace(byte octect) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java?rev=1185579&r1=1185578&r2=1185579&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java Tue Oct 18 11:20:37 2011
@@ -54,8 +54,9 @@ public class JavaUtils {
byte refBytes[] = null;
FileInputStream fisRef = new FileInputStream(fileName);
+ UnsyncByteArrayOutputStream baos = null;
try {
- UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
+ baos = new UnsyncByteArrayOutputStream();
byte buf[] = new byte[1024];
int len;
@@ -66,6 +67,7 @@ public class JavaUtils {
refBytes = baos.toByteArray();
} finally {
fisRef.close();
+ baos.close();
}
return refBytes;
@@ -116,14 +118,22 @@ public class JavaUtils {
* @throws IOException
*/
public static byte[] getBytesFromStream(InputStream inputStream) throws IOException {
- UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
- byte buf[] = new byte[4 * 1024];
- int len;
-
- while ((len = inputStream.read(buf)) > 0) {
- baos.write(buf, 0, len);
+ UnsyncByteArrayOutputStream baos = null;
+
+ byte[] retBytes = null;
+ try {
+ baos = new UnsyncByteArrayOutputStream();
+ byte buf[] = new byte[4 * 1024];
+ int len;
+
+ while ((len = inputStream.read(buf)) > 0) {
+ baos.write(buf, 0, len);
+ }
+ retBytes = baos.toByteArray();
+ } finally {
+ baos.close();
}
- return baos.toByteArray();
+ return retBytes;
}
}