Fix NPE in equals

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-05-18 15:02:49 +02:00
parent 05615a9e86
commit 96af492a9c

View File

@@ -339,7 +339,7 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + (fileName == null ? 0 : fileName.hashCode()); result = prime * result + ((fileName == null) ? 0 : fileName.hashCode());
return result; return result;
} }
@@ -348,12 +348,17 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene
if (this == obj) { if (this == obj) {
return true; return true;
} }
if (!(obj instanceof UploadHandler)) { if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false; return false;
} }
final UploadHandler other = (UploadHandler) obj; final UploadHandler other = (UploadHandler) obj;
if (fileName == null && other.fileName != null) { if (fileName == null) {
return false; if (other.fileName != null) {
return false;
}
} else if (!fileName.equals(other.fileName)) { } else if (!fileName.equals(other.fileName)) {
return false; return false;
} }