You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2017/09/26 15:57:55 UTC
commons-compress git commit: add-small-code-improvements Added small
code improvements.
Repository: commons-compress
Updated Branches:
refs/heads/master 441779141 -> f8a715625
add-small-code-improvements Added small code improvements.
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/f8a71562
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/f8a71562
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/f8a71562
Branch: refs/heads/master
Commit: f8a7156259dcc1b3321086939234d80b6ab828c6
Parents: 4417791
Author: Michael Hausegger <ha...@googlemail.com>
Authored: Mon Sep 25 22:52:34 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Sep 26 17:56:36 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/compress/changes/ChangeSet.java | 6 ++----
.../org/apache/commons/compress/changes/ChangeSetResults.java | 5 +----
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f8a71562/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
----------------------------------------------------------------------
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 55f5c4e..42e3d3f 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
@@ -143,10 +143,8 @@ public final class ChangeSet {
continue;
}
- if (Change.TYPE_DELETE == pChange.type() && source.equals(target)) {
- it.remove();
- } else if (Change.TYPE_DELETE_DIR == pChange.type() &&
- target.matches(source + "/.*")) {
+ if (Change.TYPE_DELETE == pChange.type() && source.equals(target) ||
+ (Change.TYPE_DELETE_DIR == pChange.type() && target.matches(source + "/.*"))) {
it.remove();
}
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f8a71562/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java b/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
index cf2f019..8f100b3 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
@@ -85,9 +85,6 @@ public class ChangeSetResults {
* @return true, if this filename already has been added
*/
boolean hasBeenAdded(final String filename) {
- if(addedFromChangeSet.contains(filename) || addedFromStream.contains(filename)) {
- return true;
- }
- return false;
+ return addedFromChangeSet.contains(filename) || addedFromStream.contains(filename);
}
}