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 2020/06/08 04:14:49 UTC

[commons-compress] branch master updated: remove `== null` as it is covered by `instance of`

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

bodewig 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 1838163  remove `== null` as it is covered by `instance of`
     new 2840244  Merge pull request #112 from XenoAmess/remove_`==_null`_as_it_is_covered_by_`instance_of`
1838163 is described below

commit 183816382a376ed22f37204eec6caaa5622a100b
Author: XenoAmess <xe...@gmail.com>
AuthorDate: Fri Jun 5 03:43:29 2020 +0800

    remove `== null` as it is covered by `instance of`
---
 .../org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java  | 2 +-
 src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java    | 2 +-
 src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
index 0efb997..a91468c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
@@ -212,7 +212,7 @@ public final class ZipEightByteInteger implements Serializable {
      */
     @Override
     public boolean equals(final Object o) {
-        if (o == null || !(o instanceof ZipEightByteInteger)) {
+        if (!(o instanceof ZipEightByteInteger)) {
             return false;
         }
         return value.equals(((ZipEightByteInteger) o).getValue());
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
index c81bd17..7b6d978 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
@@ -184,7 +184,7 @@ public final class ZipLong implements Cloneable, Serializable {
      */
     @Override
     public boolean equals(final Object o) {
-        if (o == null || !(o instanceof ZipLong)) {
+        if (!(o instanceof ZipLong)) {
             return false;
         }
         return value == ((ZipLong) o).getValue();
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
index 3207893..93d4bed 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
@@ -129,7 +129,7 @@ public final class ZipShort implements Cloneable, Serializable {
      */
     @Override
     public boolean equals(final Object o) {
-        if (o == null || !(o instanceof ZipShort)) {
+        if (!(o instanceof ZipShort)) {
             return false;
         }
         return value == ((ZipShort) o).getValue();