Author: jheight
Date: Tue Jul 25 05:19:31 2006
New Revision: 425384
URL: http://svn.apache.org/viewvc?rev=425384&view=rev
Log:
Bug 17890: Corrected exception text for zero byte file.
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java?rev=425384&r1=425383&r2=425384&view=diff
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
(original)
+++
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
Tue Jul 25 05:19:31 2006
@@ -72,6 +72,9 @@
if (byte_count != POIFSConstants.BIG_BLOCK_SIZE)
{
+ if (byte_count == -1)
+ //Cant have -1 bytes read in the error message!
+ byte_count = 0;
String type = " byte" + ((byte_count == 1) ? ("")
: ("s"));
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java?rev=425384&r1=425383&r2=425384&view=diff
==============================================================================
--- jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
(original)
+++ jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
Tue Jul 25 05:19:31 2006
@@ -56,6 +56,10 @@
}
else if (count != POIFSConstants.BIG_BLOCK_SIZE)
{
+ if (count == -1)
+ //Cant have -1 bytes read in the error message!
+ count = 0;
+
String type = " byte" + ((count == 1) ? ("")
: ("s"));
---------------------------------------------------------------------
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/
