[484649] IllegalArgumentException in Buffer.limit()

https://bugs.eclipse.org/bugs/show_bug.cgi?id=484649

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
index 4acffce8e3..30e145259f 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
@@ -90,7 +90,7 @@ public class SSLBuffer extends Buffer
         payloadSize = (short)-payloadSize;
       }
 
-      payloadSize -= FLAGS_OFFSET;
+      payloadSize -= MAKE_PAYLOAD_SIZE_NON_ZERO;
 
       byteBuffer.position(IBuffer.HEADER_SIZE);
       setState(BufferState.READING_HEADER);
@@ -149,7 +149,7 @@ public class SSLBuffer extends Buffer
           throw new IllegalStateException("channelID == NO_CHANNEL"); //$NON-NLS-1$
         }
 
-        int payloadSize = byteBuffer.position() - IBuffer.HEADER_SIZE + FLAGS_OFFSET;
+        int payloadSize = byteBuffer.position() - IBuffer.HEADER_SIZE + MAKE_PAYLOAD_SIZE_NON_ZERO;
         if (isEOS())
         {
           payloadSize = -payloadSize;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
index 065c5dd1ba..8a3e6d0058 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
@@ -37,7 +37,7 @@ import java.text.MessageFormat;
  */
 public class Buffer implements InternalBuffer
 {
-  public static final int FLAGS_OFFSET = 1;
+  public static final int MAKE_PAYLOAD_SIZE_NON_ZERO = 1;
 
   private static final byte FLAG_EOS = 1 << 0;
 
@@ -211,7 +211,7 @@ public class Buffer implements InternalBuffer
           payloadSize = (short)-payloadSize;
         }
 
-        payloadSize -= FLAGS_OFFSET;
+        payloadSize -= MAKE_PAYLOAD_SIZE_NON_ZERO;
 
         byteBuffer.clear();
 
@@ -335,7 +335,7 @@ public class Buffer implements InternalBuffer
           throw new IllegalStateException("channelID == NO_CHANNEL"); //$NON-NLS-1$
         }
 
-        int payloadSize = byteBuffer.position() - IBuffer.HEADER_SIZE + FLAGS_OFFSET;
+        int payloadSize = byteBuffer.position() - IBuffer.HEADER_SIZE + MAKE_PAYLOAD_SIZE_NON_ZERO;
 
         boolean eos = isEOS();
         if (eos)
@@ -526,7 +526,7 @@ public class Buffer implements InternalBuffer
       eos = true;
     }
 
-    payloadSize -= FLAGS_OFFSET;
+    payloadSize -= MAKE_PAYLOAD_SIZE_NON_ZERO;
 
     System.out.println("channelID:     " + channelID);
     System.out.println("payloadSize:   " + payloadSize);