Repository: commons-compress Updated Branches: refs/heads/master 08cdbe299 -> d8e4e255d
Revert to the original logic. Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/bfbe9966 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/bfbe9966 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/bfbe9966 Branch: refs/heads/master Commit: bfbe9966ab45dc4787fdbc55735241023d826d95 Parents: bf0dd95 Author: shahab <[email protected]> Authored: Tue Jan 16 14:15:18 2018 -0500 Committer: Stefan Bodewig <[email protected]> Committed: Thu Jan 18 14:20:49 2018 +0100 ---------------------------------------------------------------------- .../commons/compress/archivers/dump/DumpArchiveEntry.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/bfbe9966/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java index 656ab7d..43db740 100644 --- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java @@ -418,8 +418,12 @@ public class DumpArchiveEntry implements ArchiveEntry { } // summary is always null right now, but this may change some day - return (summary != null || rhs.summary == null) // NOSONAR - && (summary == null || summary.equals(rhs.summary)); + if ((summary == null && rhs.summary != null) // NOSONAR + || (summary != null && !summary.equals(rhs.summary))) { // NOSONAR + return false; + } + + return true; } @Override
