refine contentEquals(InputStream, InputStream)

Author: XenoAmess

src/main/java/org/apache/commons/io/IOUtils.java

@@ -714,17 +714,40 @@ public static boolean contentEquals(final InputStream input1, final InputStream
         if (input1 == null ^ input2 == null) {
             return false;
         }
-        final BufferedInputStream bufferedInput1 = buffer(input1);
-        final BufferedInputStream bufferedInput2 = buffer(input2);
-        int ch = bufferedInput1.read();
-        while (EOF != ch) {
-            final int ch2 = bufferedInput2.read();
-            if (ch != ch2) {
-                return false;
+
+        byte[] byteArray1 = new byte[CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE];
+        byte[] byteArray2 = new byte[CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE];
+        int nowPos1;
+        int nowPos2;
+        int nowRead1;
+        int nowRead2;
+        while (true) {
+            nowPos1 = 0;
+            nowPos2 = 0;
+            for (int nowCheck = 0; nowCheck < CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE; nowCheck++) {
+                if (nowPos1 == nowCheck) {
+                    do {
+                        nowRead1 = input1.read(byteArray1, nowPos1, CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE - nowPos1);
+                    } while (nowRead1 == 0);
+                    if (nowRead1 == -1) {
+                        return nowPos2 == nowCheck && input2.read() == -1;
+                    }
+                    nowPos1 += nowRead1;
+                }
+                if (nowPos2 == nowCheck) {
+                    do {
+                        nowRead2 = input2.read(byteArray2, nowPos2, CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE - nowPos2);
+                    } while (nowRead2 == 0);
+                    if (nowRead2 == -1) {
+                        return nowPos1 == nowCheck && input1.read() == -1;
+                    }
+                    nowPos2 += nowRead2;
+                }
+                if (byteArray1[nowCheck] != byteArray2[nowCheck]) {
+                    return false;
+                }
             }
-            ch = bufferedInput1.read();
         }
-        return bufferedInput2.read() == EOF;
     }
 
     private static final int CONTENT_EQUALS_CHAR_ARRAY_BUFFER_SIZE = 8192;