Also fix read()

eclipse-ee4j · Aug 12, 2019 · fc342a0 · fc342a0
1 parent d0b6502
commit fc342a0
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/...nnector/src/main/java/org/glassfish/jersey/netty/connector/internal/NettyInputStream.java b/...nnector/src/main/java/org/glassfish/jersey/netty/connector/internal/NettyInputStream.java
@@ -68,9 +68,11 @@ public NettyInputStream(LinkedBlockingDeque<InputStream> isList) {
         this.isList = isList;
     }
 
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
+    private interface ISReader {
+        int readFrom(InputStream take) throws IOException;
+    }
 
+    private int readInternal(ISReader takeRead) throws IOException {
         if (end) {
             return -1;
         }
@@ -83,7 +85,7 @@ public int read(byte[] b, int off, int len) throws IOException {
                 return -1;
             }
 
-            int read = take.read(b, off, len);
+            int read = takeRead.readFrom(take);
 
             if (take.available() > 0) {
                 isList.addFirst(take);
@@ -98,29 +100,13 @@ public int read(byte[] b, int off, int len) throws IOException {
     }
 
     @Override
-    public int read() throws IOException {
-
-        if (end) {
-            return -1;
-        }
-
-        try {
-            InputStream take = isList.take();
-
-            if (checkEndOfInput(take)) {
-                return -1;
-            }
-
-            int read = take.read();
-
-            if (take.available() > 0) {
-                isList.addFirst(take);
-            }
+    public int read(byte[] b, int off, int len) throws IOException {
+        return readInternal(take -> take.read(b, off, len));
+    }
 
-            return read;
-        } catch (InterruptedException e) {
-            throw new IOException("Interrupted.", e);
-        }
+    @Override
+    public int read() throws IOException {
+        return readInternal(InputStream::read);
     }
 
     @Override