Fix potential stuck at UnixDomainSocket.read() (HttpClient transport) (#1475)

tejksat · tejksat · commit f648421b89b3 · 2020-11-03T11:31:28.000+03:00
Prevent unnecessary recurring calls of `read()` on UNIX socket, which may result in blocking read and cause hanging of "docker-java-stream" thread.
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
@@ -231,24 +231,16 @@ class UnixSocketInputStream extends InputStream {
         public int read(byte[] bytesEntry, int off, int len) throws IOException {
             try {
                 if (off > 0) {
-                    int bytes = 0;
-                    int remainingLength = len;
-                    int size;
                     byte[] data = new byte[(len < 10240) ? len : 10240];
-                    do {
-                        if (!isConnected()) {
-                            return -1;
-                        }
-                        size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240);
-                        if (size <= 0) {
-                            return -1;
-                        }
-                        System.arraycopy(data, 0, bytesEntry, off, size);
-                        bytes += size;
-                        off += size;
-                        remainingLength -= size;
-                    } while ((remainingLength > 0) && (size > 0));
-                    return bytes;
+                    if (!isConnected()) {
+                        return -1;
+                    }
+                    int size = UnixDomainSocket.read(fd, data, (len < 10240) ? len : 10240);
+                    if (size <= 0) {
+                        return -1;
+                    }
+                    System.arraycopy(data, 0, bytesEntry, off, size);
+                    return size;
                 } else {
                     if (!isConnected()) {
                         return -1;
