Merge pull request #16360 from iterate-ch/dependabot/maven/commons-io…

…-commons-io-2.17.0 Bump commons-io:commons-io from 2.16.1 to 2.17.0
iterate-ch · Nov 7, 2024 · f1306b8 · f1306b8
2 parents 5e1d091 + 81d1e02
commit f1306b8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/io/AbstractChecksumCompute.java b/core/src/main/java/ch/cyberduck/core/io/AbstractChecksumCompute.java
@@ -52,7 +52,7 @@ protected byte[] digest(final InputStream in, final MessageDigest md, final Stre
         try {
             byte[] buffer = new byte[16384];
             int bytesRead;
-            while((bytesRead = in.read(buffer, 0, buffer.length)) != -1) {
+            while((bytesRead = in.read(buffer, 0, buffer.length)) != IOUtils.EOF) {
                 cancelation.validate();
                 md.update(buffer, 0, bytesRead);
             }

diff --git a/core/src/test/java/ch/cyberduck/core/io/DisabledChecksumComputeTest.java b/core/src/test/java/ch/cyberduck/core/io/DisabledChecksumComputeTest.java
@@ -27,8 +27,7 @@ public class DisabledChecksumComputeTest {
     @Test
     public void compute() throws Exception {
         final NullInputStream in = new NullInputStream(0L);
-        new DisabledChecksumCompute().compute(in, new TransferStatus());
-        assertEquals(-1, in.read());
         assertEquals(-1, in.read());
+        assertEquals(Checksum.NONE, new DisabledChecksumCompute().compute(in, new TransferStatus()));
     }
 }
diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java
@@ -74,9 +74,8 @@ public Directory withWriter(final Write writer) {
         assertNotEquals(compute.compute(new NullInputStream(1025L), new TransferStatus().withLength(1025L).withHeader(header).withNonces(nonces)),
             compute.compute(new NullInputStream(1025L), new TransferStatus().withLength(1025L).withHeader(header).withNonces(nonces)));
         assertNotNull(compute.compute(new NullInputStream(0L), new TransferStatus().withLength(0L).withHeader(header).withNonces(nonces)).hash);
-        final NullInputStream input = new NullInputStream(0L);
-        assertEquals(compute.compute(input, new TransferStatus().withHeader(header).withNonces(nonces)),
-            compute.compute(input, new TransferStatus().withHeader(header).withNonces(nonces)));
+        assertEquals(compute.compute(new NullInputStream(0L), new TransferStatus().withHeader(header).withNonces(nonces)),
+                compute.compute(new NullInputStream(0L), new TransferStatus().withHeader(header).withNonces(nonces)));
         assertNotEquals(compute.compute(new NullInputStream(0L), new TransferStatus().withHeader(header).withNonces(nonces)),
             sha.compute(new NullInputStream(0L), new TransferStatus()));
     }

diff --git a/pom.xml b/pom.xml
@@ -176,7 +176,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.16.1</version>
+                <version>2.17.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>