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 2013/01/15 11:32:47 UTC
svn commit: r1433343 - in
/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils:
UnsyncBufferedOutputStream.java UnsyncByteArrayOutputStream.java
Author: coheigea
Date: Tue Jan 15 10:32:47 2013
New Revision: 1433343
URL: http://svn.apache.org/viewvc?rev=1433343&view=rev
Log:
Revert "[SANTUARIO-351] - Removed ThreadLocal storage from OutputStreams"
This reverts commit 1cf90a82f4abd3c7fe73c5194ba08b95e1ab8b1e.
Conflicts:
src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
Modified:
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java?rev=1433343&r1=1433342&r2=1433343&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncBufferedOutputStream.java Tue Jan 15 10:32:47 2013
@@ -27,6 +27,12 @@ import java.io.OutputStream;
*/
public class UnsyncBufferedOutputStream extends OutputStream {
static final int size = 8*1024;
+ private static ThreadLocal<byte[]> bufCache = new ThreadLocal<byte[]>() {
+ @Override
+ protected synchronized byte[] initialValue() {
+ return new byte[size];
+ }
+ };
private int pointer = 0;
private final OutputStream out;
@@ -38,7 +44,7 @@ public class UnsyncBufferedOutputStream
* @param out the outputstream to buffer
*/
public UnsyncBufferedOutputStream(OutputStream out) {
- buf = new byte[size];
+ buf = (byte[])bufCache.get();
this.out = out;
}
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java?rev=1433343&r1=1433342&r2=1433343&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java Tue Jan 15 10:32:47 2013
@@ -28,13 +28,19 @@ import java.io.OutputStream;
public class UnsyncByteArrayOutputStream extends OutputStream {
private static final int INITIAL_SIZE = 8192;
+ private static ThreadLocal<byte[]> bufCache = new ThreadLocal<byte[]>() {
+ @Override
+ protected synchronized byte[] initialValue() {
+ return new byte[INITIAL_SIZE];
+ }
+ };
private byte[] buf;
private int size = INITIAL_SIZE;
private int pos = 0;
public UnsyncByteArrayOutputStream() {
- buf = new byte[INITIAL_SIZE];
+ buf = (byte[])bufCache.get();
}
public void write(byte[] arg0) {
@@ -80,7 +86,6 @@ public class UnsyncByteArrayOutputStream
public void reset() {
pos = 0;
- buf = new byte[INITIAL_SIZE];
}
private void expandSize(int newPos) {