commit e56418078455274a7ca3f3575c01feb3c643887f
author Raphaël P. Barazzutti <rbarazzutti@apache.org> Wed Jul 03 23:58:59 2013 +0200
committer Raphaël P. Barazzutti <rbarazzutti@apache.org> Thu Jul 04 00:41:04 2013 +0200
tree 453e30756be4f08039332871e3523a54bb339653
parent 47c41139436c75dcff1df04650e60f4698bdde31

IoBuffer.read(byte[],int,int) fix

codec/src/main/java/org/apache/mina/codec/IoBuffer.java

diff --git a/codec/src/main/java/org/apache/mina/codec/IoBuffer.java b/codec/src/main/java/org/apache/mina/codec/IoBuffer.java
index 1be49a5..e3ff463 100644
--- a/codec/src/main/java/org/apache/mina/codec/IoBuffer.java
+++ b/codec/src/main/java/org/apache/mina/codec/IoBuffer.java
@@ -181,6 +181,10 @@
 
             @Override
             public int read(byte[] b, int off, int len) throws IOException {
+                if (!hasRemaining()) {
+                    return -1;
+                }
+
                 int toRead = Math.min(remaining(), len);
                 get(b, off, toRead);
                 return toRead;
@@ -350,13 +354,12 @@
         if (remaining() < length) {
             throw new BufferUnderflowException();
         }
-        position.getNode().getBuffer().position(position.getPositionInNode());
         int remainsToCopy = length;
         int currentOffset = offset;
 
         while (remainsToCopy > 0) {
             position.updatePos();
-
+            position.getNode().getBuffer().position(position.getPositionInNode());
             ByteBuffer currentBuffer = position.getNode().getBuffer();
             int blocksize = Math.min(remainsToCopy, currentBuffer.remaining());
             position.getNode().getBuffer().get(dst, currentOffset, blocksize);
@@ -365,8 +368,9 @@
             remainsToCopy -= blocksize;
 
             position.incrementPosition(blocksize);
+
+            position.getNode().getBuffer().position(0);
         }
-        position.getNode().getBuffer().position(0);
         return this;
     }
 
@@ -670,13 +674,12 @@
 
         return this;
     }
-    
-    
+
     /**
      * @see ByteBuffer#put(ByteBuffer)
      */
     public IoBuffer put(IoBuffer src) {
-        if(src==this){ // NOSONAR, checking the instance
+        if (src == this) { // NOSONAR, checking the instance
             throw new IllegalArgumentException();
         }