Read only the expected byte instead the reported by remote

Author: velitasali

src/main/java/org/monora/coolsocket/core/config/Config.java

@@ -13,5 +13,5 @@ public final class Config
     /**
      *
      */
-    public static final int DATA_EXCHANGE_BYTE_SIZE = 8096;
+    public static final int DATA_EXCHANGE_BYTE_SIZE = 8192;
 }

src/main/java/org/monora/coolsocket/core/session/ActiveConnection.java

@@ -434,7 +434,7 @@ public int read(Description description) throws IOException
         }
 
         description.byteBuffer.clear();
-        int length = (int) Math.min(description.byteBuffer.remaining(), description.nextAvailable);
+        int length = (int) Math.min(description.byteBuffer.remaining(), Math.min(description.nextAvailable, description.available()));
         description.byteBuffer.limit(length);
         length = getReadableByteChannel().read(description.byteBuffer);
         description.byteBuffer.flip();
@@ -457,7 +457,7 @@ public int read(Description description) throws IOException
      */
     public Description readBegin() throws IOException
     {
-        return readBegin(new byte[8096]);
+        return readBegin(new byte[8192]);
     }
 
     /**
@@ -785,7 +785,7 @@ public synchronized void write(Description description, byte[] bytes, int offset
 
         if (lengthActual < length)
             throw new SizeLimitExceededException("The length requested exceeds the data size reported to the remote. " +
-                    "The requested size has been written to the remote, but this is an error that should handled.",
+                    "The expected size has been written to the remote, but this is an error that should handled.",
                     description.totalLength, description.consumedLength - lengthActual + length);
     }
 
@@ -799,7 +799,7 @@ public synchronized void write(Description description, byte[] bytes, int offset
     public synchronized void write(Description description, InputStream inputStream) throws IOException
     {
         int len;
-        byte[] buffer = new byte[8096];
+        byte[] buffer = new byte[8192];
         while ((len = inputStream.read(buffer)) != -1) {
             write(description, buffer, 0, len);
         }
@@ -835,7 +835,7 @@ public synchronized Description writeBegin(long flags) throws IOException
      */
     public synchronized Description writeBegin(long flags, long totalLength) throws IOException
     {
-        ByteBuffer byteBuffer = ByteBuffer.allocate(8096);
+        ByteBuffer byteBuffer = ByteBuffer.allocate(8192);
         int operationId = (int) (Integer.MAX_VALUE * Math.random());
         Description description = new Description(flags, operationId, totalLength, byteBuffer);
         byteBuffer.putLong(flags)
@@ -973,7 +973,7 @@ public Description(Flags flags, int operationId, long totalLength, ByteBuffer by
             if (byteBuffer == null)
                 throw new NullPointerException("Buffer cannot be null.");
 
-            if (byteBuffer.capacity() < 8096)
+            if (byteBuffer.capacity() < 8192)
                 throw new BufferUnderflowException();
 
             if (totalLength < 0)

src/test/java/org/monora/coolsocket/core/CommunicationTest.java

@@ -15,7 +15,7 @@ public class CommunicationTest
     public void speedTest() throws IOException, InterruptedException
     {
         final int repeat = 100000;
-        final byte[] data = new byte[8096];
+        final byte[] data = new byte[8192];
 
         Arrays.fill(data, (byte) 2);
 
@@ -43,10 +43,7 @@ public void onConnected(ActiveConnection activeConnection)
             long startTime = System.nanoTime();
             ActiveConnection.Description description = activeConnection.readBegin();
             do {
-                int len = activeConnection.read(description);
-                if (len > 0) {
-
-                }
+                activeConnection.read(description);
             } while (description.hasAvailable());
             System.out.println("It took: " + ((System.nanoTime() - startTime) / 1e9));
         } finally {

src/test/java/org/monora/coolsocket/core/DataTransactionTest.java

@@ -78,7 +78,7 @@ public void onConnected(ActiveConnection activeConnection)
             {
                 try {
                     ActiveConnection.Description description = activeConnection.writeBegin(0);
-                    activeConnection.write(description, new byte[8096]);
+                    activeConnection.write(description, new byte[8192]);
                     activeConnection.writeEnd(description);
                 } catch (IOException ignored) {
 
@@ -102,7 +102,7 @@ public void onConnected(ActiveConnection activeConnection)
     @Test
     public void internalCacheLimitTest() throws InterruptedException, IOException
     {
-        final int size = 8096;
+        final int size = 8192;
 
         CoolSocket coolSocket = new CoolSocket(PORT)
         {
@@ -292,17 +292,12 @@ public void onConnected(ActiveConnection activeConnection)
                 try {
                     byte[] base = message.substring(0, message.length() - 1).getBytes();
                     byte[] end = message.substring(message.length() - 1).getBytes();
-                    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(base.length);
-                    byteArrayOutputStream.write(base);
-                    byteArrayOutputStream.write(end);
-
 
                     ActiveConnection.Description description = activeConnection.writeBegin(0, bytes.length);
                     activeConnection.write(description, base);
                     activeConnection.write(description, end);
                     activeConnection.writeEnd(description);
                 } catch (SizeLimitExceededException ignored) {
-                    ignored.printStackTrace();
                 } catch (IOException e) {
                     e.printStackTrace();
                 }