Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() (OkHttp transport) (#1475)

tejksat · tejksat · commit e1372934a020 · 2020-10-27T00:44:42.000+03:00
Prevent unnecessary recurring calls of `recv()` on UNIX socket, which sometimes results in blocking read and causes hanging of "docker-java-stream" thread.
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
@@ -232,20 +232,12 @@ 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 {
-                        size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0);
-                        if (size > 0) {
-                            System.arraycopy(data, 0, bytesEntry, off, size);
-                            bytes += size;
-                            off += size;
-                            remainingLength -= size;
-                        }
-                    } while ((remainingLength > 0) && (size > 0));
-                    return bytes;
+                    int size = recv(fd, data, (len < 10240) ? len : 10240, 0);
+                    if (size > 0) {
+                        System.arraycopy(data, 0, bytesEntry, off, size);
+                    }
+                    return size;
                 } else {
                     return recv(fd, bytesEntry, len, 0);
                 }
