[commons-compress] branch master updated: Redundant return.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new 0bff34c  Redundant return.
0bff34c is described below

commit 0bff34c1b409b10f4066ced3e146ed8ae0ad0fe9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 21 13:50:30 2020 -0500

    Redundant return.
---
 src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java | 1 -
 src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java | 4 +---
 src/main/java/org/apache/commons/compress/changes/ChangeSet.java     | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index f46ae5b..3bf0b43 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -1376,7 +1376,6 @@ public class ZipFile implements Closeable {
             final int ret = read(loc, buf);
             if (ret > 0) {
                 loc += ret;
-                return ret;
             }
             return ret;
         }
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
index fb98791..6ca2d5c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
@@ -278,12 +278,10 @@ public abstract class ZipUtil {
                 } catch (final IOException ex) {
                     // UTF-8 unsupported?  should be impossible the
                     // Unicode*ExtraField must contain some bad bytes
-
-                    // TODO log this anywhere?
-                    return null;
                 }
             }
         }
+        // TODO log this anywhere?
         return null;
     }
 
diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSet.java 
b/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
index 84a4b15..0b334ae 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
@@ -107,7 +107,6 @@ public final class ChangeSet {
                         if(pChange.isReplaceMode()) {
                             it.remove();
                             changes.add(pChange);
-                            return;
                         }
                         // do not add this change
                         return;