[hornetq-commits] JBoss hornetq SVN: r11089 - trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-08-01 11:27:51 -0400 (Mon, 01 Aug 2011)
New Revision: 11089

Modified:
   trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java
Log:
HORNETQ-749 AIOSequentialFile.read(,) to return correct number of bytes read

Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java
===================================================================
--- trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java	2011-08-01 14:25:42 UTC (rev 11088)
+++ trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AIOSequentialFile.java	2011-08-01 15:27:51 UTC (rev 11089)
@@ -204,9 +204,14 @@
    public int read(final ByteBuffer bytes, final IOAsyncTask callback) throws Exception
    {
       int bytesToRead = bytes.limit();
-
       long positionToRead = position.getAndAdd(bytesToRead);
 
+      long size = size();
+      if (size < (positionToRead + bytesToRead))
+      {
+         bytesToRead = (int)(size - positionToRead);
+      }
+
       bytes.rewind();
 
       aioFile.read(positionToRead, bytesToRead, bytes, callback);