diff --git a/src/main/java/org/takes/rq/RqLive.java b/src/main/java/org/takes/rq/RqLive.java index e57eca7a5..9ddaaf84c 100644 --- a/src/main/java/org/takes/rq/RqLive.java +++ b/src/main/java/org/takes/rq/RqLive.java @@ -69,7 +69,7 @@ private static Request parse(final InputStream input) throws IOException { final Collection head = new LinkedList<>(); final ByteArrayOutputStream baos = new ByteArrayOutputStream(); Opt data = new Opt.Empty<>(); - data = RqLive.data(input, data, false); + data = RqLive.data(input, data); while (data.get() > 0) { eof = false; if (data.get() == '\r') { @@ -82,11 +82,11 @@ private static Request parse(final InputStream input) throws IOException { if (header.has()) { head.add(header.get()); } - data = RqLive.data(input, data, false); + data = RqLive.data(input, data); continue; } baos.write(RqLive.legalCharacter(data, baos, head.size() + 1)); - data = RqLive.data(input, new Opt.Empty<>(), true); + data = RqLive.data(input, new Opt.Empty<>()); } if (eof) { throw new IOException("empty request"); @@ -170,18 +170,14 @@ private static Integer legalCharacter(final Opt data, * Obtains new byte if hasn't. * @param input Stream * @param data Empty or current data - * @param available Indicates whether or not it should check first if there - * are available bytes * @return Next or current data * @throws IOException if input.read() fails */ private static Opt data(final InputStream input, - final Opt data, final boolean available) throws IOException { + final Opt data) throws IOException { final Opt ret; if (data.has()) { ret = data; - } else if (available && input.available() <= 0) { - ret = new Opt.Single<>(-1); } else { ret = new Opt.Single<>(input.read()); }