rolled concurrency fix into branch

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_2_BRANCH@353162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew C. Oliver 2003-06-26 22:16:28 +00:00
parent f66a003844
commit 9c9b3a6094

View File

@ -475,23 +475,10 @@ public class LittleEndian
return getLong(readFromStream(stream, LONG_SIZE)); return getLong(readFromStream(stream, LONG_SIZE));
} }
private final static byte[] _short_buffer = new byte[SHORT_SIZE];
private final static byte[] _int_buffer = new byte[INT_SIZE];
private final static byte[] _long_buffer = new byte[LONG_SIZE];
/** /**
* Read the appropriate number of bytes from the stream and return them to * Read the appropriate number of bytes from the stream and return them to
* the caller. <p> * the caller. <p>
* *
* It should be noted that, in an attempt to improve system performance and
* to prevent a transient explosion of discarded byte arrays to be garbage
* collected, static byte arrays are employed for the standard cases of
* reading a short, an int, or a long. <p>
*
* <b>THIS INTRODUCES A RISK FOR THREADED OPERATIONS!</b> <p>
*
* However, for the purposes of the POI project, this risk is deemed * However, for the purposes of the POI project, this risk is deemed
* negligible. It is, however, so noted. * negligible. It is, however, so noted.
* *
@ -510,23 +497,8 @@ public class LittleEndian
public static byte[] readFromStream(final InputStream stream, public static byte[] readFromStream(final InputStream stream,
final int size) final int size)
throws IOException, BufferUnderrunException { throws IOException, BufferUnderrunException {
byte[] buffer = null; byte[] buffer = new byte[size];
switch (size) {
case SHORT_SIZE:
buffer = _short_buffer;
break;
case INT_SIZE:
buffer = _int_buffer;
break;
case LONG_SIZE:
buffer = _long_buffer;
break;
default:
buffer = new byte[size];
break;
}
int count = stream.read(buffer); int count = stream.read(buffer);
if (count == -1) { if (count == -1) {