Fix NPE in equals

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
eclipse · May 18, 2016 · 96af492 · 96af492
1 parent 05615a9
commit 96af492
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
@@ -339,7 +339,7 @@ public void write(final int i) throws IOException {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + (fileName == null ? 0 : fileName.hashCode());
+        result = prime * result + ((fileName == null) ? 0 : fileName.hashCode());
         return result;
     }
 
@@ -348,12 +348,17 @@ public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
-        if (!(obj instanceof UploadHandler)) {
+        if (obj == null) {
             return false;
         }
-        final UploadHandler other = (UploadHandler) obj;
-        if (fileName == null && other.fileName != null) {
+        if (getClass() != obj.getClass()) {
             return false;
+        }
+        final UploadHandler other = (UploadHandler) obj;
+        if (fileName == null) {
+            if (other.fileName != null) {
+                return false;
+            }
         } else if (!fileName.equals(other.fileName)) {
             return false;
         }