HTTPCORE-608, regression: fixes regression introduced by fd2d0c2004e858d4f30aad5cf64f19045005811c
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
index 4f693af..c4e82a8 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
@@ -128,7 +128,7 @@
public void put(final ByteBuffer src) {
if (src != null && src.hasRemaining()) {
setInputMode();
- ensureCapacity(buffer().remaining() + src.remaining());
+ ensureCapacity(buffer().position() + src.remaining());
buffer().put(src);
}
}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestExpandableBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestExpandableBuffer.java
new file mode 100644
index 0000000..0cbf1ff
--- /dev/null
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestExpandableBuffer.java
@@ -0,0 +1,68 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.http.impl.nio;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestExpandableBuffer {
+
+ @Test
+ public void testReadLineChunks() throws Exception {
+ final ExpandableBuffer buffer = new ExpandableBuffer(16);
+ Assert.assertThat(buffer.mode(), CoreMatchers.equalTo(ExpandableBuffer.Mode.INPUT));
+ Assert.assertThat(buffer.hasData(), CoreMatchers.equalTo(false));
+
+ buffer.setInputMode();
+ buffer.buffer().put(new byte[] { 0, 1, 2, 3, 4, 5});
+ Assert.assertThat(buffer.hasData(), CoreMatchers.equalTo(true));
+ Assert.assertThat(buffer.length(), CoreMatchers.equalTo(6));
+ Assert.assertThat(buffer.buffer().capacity(), CoreMatchers.equalTo(16));
+ Assert.assertThat(buffer.mode(), CoreMatchers.equalTo(ExpandableBuffer.Mode.OUTPUT));
+
+ buffer.setInputMode();
+ buffer.buffer().put(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 });
+ Assert.assertThat(buffer.length(), CoreMatchers.equalTo(16));
+ Assert.assertThat(buffer.buffer().capacity(), CoreMatchers.equalTo(16));
+ Assert.assertThat(buffer.mode(), CoreMatchers.equalTo(ExpandableBuffer.Mode.OUTPUT));
+
+ buffer.setInputMode();
+ buffer.ensureCapacity(22);
+ buffer.buffer().put(new byte[] { 0, 1, 2, 3, 4, 5});
+ Assert.assertThat(buffer.length(), CoreMatchers.equalTo(22));
+ Assert.assertThat(buffer.buffer().capacity(), CoreMatchers.equalTo(22));
+ Assert.assertThat(buffer.mode(), CoreMatchers.equalTo(ExpandableBuffer.Mode.OUTPUT));
+
+ buffer.clear();
+ Assert.assertThat(buffer.mode(), CoreMatchers.equalTo(ExpandableBuffer.Mode.INPUT));
+ Assert.assertThat(buffer.hasData(), CoreMatchers.equalTo(false));
+ Assert.assertThat(buffer.capacity(), CoreMatchers.equalTo(22));
+ }
+
+}
