[infinispan-commits] Infinispan SVN: r487 - trunk/core/src/main/java/org/infinispan/loaders/file.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-06-19 14:02:01 -0400 (Fri, 19 Jun 2009)
New Revision: 487

Modified:
   trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
Log:
[ISPN-110] (FileCacheStore.fromStreamLockSafe() should only read available bytes or streamBufferSize) Fixed. 

Modified: trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	2009-06-19 16:45:16 UTC (rev 486)
+++ trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	2009-06-19 18:02:01 UTC (rev 487)
@@ -79,7 +79,12 @@
             BufferedOutputStream bos = new BufferedOutputStream(fos, streamBufferSize);
 
             while (numBytes > totalBytesRead) {
-               bytesRead = objectInput.read(buffer, 0, streamBufferSize);
+               if ((numBytes - totalBytesRead) > streamBufferSize) {
+                  bytesRead = objectInput.read(buffer, 0, streamBufferSize);
+               } else {
+                  bytesRead = objectInput.read(buffer, 0, numBytes - totalBytesRead);
+               }
+               
                if (bytesRead == -1) break;
                totalBytesRead += bytesRead;
                bos.write(buffer, 0, bytesRead);