avik 2003/07/31 12:35:19
Modified: src/java/org/apache/poi/poifs/storage DocumentBlock.java
HeaderBlockReader.java RawDataBlock.java
src/testcases/org/apache/poi/poifs/filesystem
TestDocument.java
Added: src/java/org/apache/poi/util IOUtils.java
src/testcases/org/apache/poi/poifs/filesystem
SlowInputStream.java
Log:
Slow input stream patch, bug 13478
Thanks Tony Chao and Chris Nokleberg
Added to HEAD, not fully tested, since HEAD is unstable atm.
fully tested in Branch
Revision Changes Path
1.4 +2 -1
jakarta-poi/src/java/org/apache/poi/poifs/storage/DocumentBlock.java
Index: DocumentBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/DocumentBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DocumentBlock.java 30 Apr 2003 04:38:56 -0000 1.3
+++ DocumentBlock.java 31 Jul 2003 19:35:19 -0000 1.4
@@ -62,6 +62,7 @@
import java.util.Arrays;
import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.IOUtils;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -106,7 +107,7 @@
throws IOException
{
this();
- int count = stream.read(_data);
+ int count = IOUtils.readFully(stream, _data);
_bytes_read = (count == -1) ? 0
: count;
1.4 +2 -1
jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
Index: HeaderBlockReader.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HeaderBlockReader.java 30 Apr 2003 04:38:57 -0000 1.3
+++ HeaderBlockReader.java 31 Jul 2003 19:35:19 -0000 1.4
@@ -60,6 +60,7 @@
import java.util.*;
import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.IOUtils;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -104,7 +105,7 @@
throws IOException
{
_data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
- int byte_count = stream.read(_data);
+ int byte_count = IOUtils.readFully(stream, _data);
if (byte_count != POIFSConstants.BIG_BLOCK_SIZE)
{
1.4 +2 -1
jakarta-poi/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
Index: RawDataBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/RawDataBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RawDataBlock.java 30 Apr 2003 04:38:56 -0000 1.3
+++ RawDataBlock.java 31 Jul 2003 19:35:19 -0000 1.4
@@ -56,6 +56,7 @@
package org.apache.poi.poifs.storage;
import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.IOUtils;
import java.io.*;
@@ -84,7 +85,7 @@
throws IOException
{
_data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
- int count = stream.read(_data);
+ int count = IOUtils.readFully(stream, _data);
if (count == -1)
{
1.1 jakarta-poi/src/java/org/apache/poi/util/IOUtils.java
Index: IOUtils.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache POI" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache POI", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.poi.util;
import java.io.IOException;
import java.io.InputStream;
public class IOUtils
{
private IOUtils()
{
}
/**
* Helper method, just calls <tt>readFully(in, b, 0, b.length)</tt>
*/
public static int readFully(InputStream in, byte[] b)
throws IOException
{
return readFully(in, b, 0, b.length);
}
/**
* Same as the normal <tt>in.read(b, off, len)</tt>, but tries to ensure that
* the entire len number of bytes is read.
* <p>
* If the end of file is reached before any bytes are read, returns -1.
* Otherwise, returns the number of bytes read.
*/
public static int readFully(InputStream in, byte[] b, int off, int len)
throws IOException
{
int total = 0;
for (;;) {
int got = in.read(b, off + total, len - total);
if (got < 0) {
return (total == 0) ? -1 : total;
} else {
total += got;
if (total == len)
return total;
}
}
}
}
1.3 +1 -1
jakarta-poi/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
Index: TestDocument.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestDocument.java 30 Apr 2003 04:39:11 -0000 1.2
+++ TestDocument.java 31 Jul 2003 19:35:19 -0000 1.3
@@ -107,7 +107,7 @@
{
array[ j ] = ( byte ) j;
}
- document = new POIFSDocument("foo", new ByteArrayInputStream(array));
+ document = new POIFSDocument("foo", new SlowInputStream(new
ByteArrayInputStream(array)));
checkDocument(document, array);
// verify correct number of blocks get created for document
1.1
jakarta-poi/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java
Index: SlowInputStream.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache POI" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache POI", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.poi.poifs.filesystem;
import java.io.*;
import java.util.Random;
/**
* Returns a random amount of requested data. Used to check conformance with
* InputStream API contracts.
*/
public class SlowInputStream extends FilterInputStream
{
private Random r = new Random(0);
public SlowInputStream(InputStream in) {
super(in);
}
public int read(byte[] b, int off, int len) throws IOException {
return super.read(b, off, r.nextInt(len) + 1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
