You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/09/11 23:27:24 UTC

(commons-compress) 03/10: Combine if clauses

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

commit b8ec26f8b2e2d3db31b64bdb893291ab46f97bcb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 11 19:25:46 2024 -0400

    Combine if clauses
---
 .../apache/commons/compress/changes/ChangeSetPerformer.java  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
index b7b739aca..8472d4dfd 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
@@ -207,13 +207,11 @@ public class ChangeSetPerformer<I extends ArchiveInputStream<E>, O extends Archi
                         results.deleted(name);
                         break;
                     }
-                } else if (type == ChangeType.DELETE_DIR && name != null) {
-                    // don't combine ifs to make future extensions more easy
-                    if (name.startsWith(change.getTargetFileName() + "/")) { // NOPMD NOSONAR
-                        copy = false;
-                        results.deleted(name);
-                        break;
-                    }
+                } else // don't combine ifs to make future extensions more easy
+                if (type == ChangeType.DELETE_DIR && name != null && name.startsWith(change.getTargetFileName() + "/")) { // NOPMD NOSONAR
+                    copy = false;
+                    results.deleted(name);
+                    break;
                 }
             }