summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-07 13:01:19 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-07 13:01:19 +0100
commit976397b4c5f75d168ffc68aa0742c433a5d92f88 (patch)
treee7a4d7239335a05ea098cb8747792486025bec6f /jdisc_http_service
parent487d18a21da0b95acf282d6fcaf95e41b9582b37 (diff)
Revert "Don't call available()"
This reverts commit cab0bf8bb757968c5ed1523e5b3fea97ea2d2136.
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
index df91037d103..a763a03d39d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
@@ -108,7 +108,9 @@ class ServletRequestReader implements ReadListener {
@Override
public void onDataAvailable() throws IOException {
while (servletInputStream.isReady()) {
- final byte[] buffer = new byte[MIN_BUFFER_SIZE_BYTES];
+ final int estimatedNumBytesAvailable = servletInputStream.available();
+ final int bufferSizeBytes = Math.max(estimatedNumBytesAvailable, MIN_BUFFER_SIZE_BYTES);
+ final byte[] buffer = new byte[bufferSizeBytes];
final int numBytesRead = servletInputStream.read(buffer);
if (numBytesRead < 0) {
// End of stream; there should be no more data available, ever.