Fix bug #51100 - Fix IOUtils issue for NPOIFS reading from an InputStream where every...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1095753 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 45bd6658c62874201bdcac941c7a67b6bec88d8a..f10d4d36eb62bf63b4cdcfb97ea60718c55c1fbd 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta3" date="2011-??-??">
+           <action dev="poi-developers" type="fix">51100 - Fix IOUtils issue for NPOIFS reading from an InputStream where every block is full</action>
            <action dev="poi-developers" type="fix">50956 - Correct XSSF cell style cloning between workbooks</action>
            <action dev="poi-developers" type="add">Add get/setForceFormulaRecalculation for XSSF, and promote the methods to the common usermodel Sheet</action>
            <action dev="poi-developers" type="fix">Tweak the logic for sizing the HSSFCells array on a HSSFRow to reduce memory over allocation in many use cases</action>

diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java
index c3c8fa1ac9ff5197baac4df57e1aeb16bd7a26bb..d67bde26436805d803b553c7b5e6f4c3b559b4d7 100644 (file)
--- a/src/java/org/apache/poi/util/IOUtils.java
+++ b/src/java/org/apache/poi/util/IOUtils.java
@@ -110,7 +110,7 @@ public final class IOUtils {
             return (total == 0) ? -1 : total;
          }
          total += got;
-         if (total == b.capacity()) {
+         if (total == b.capacity() || b.position() == b.capacity()) {
             return total;
          }
       }