fix potential NPE in JobParameter.equals() (FINERACT-428)

This commit is contained in:
Michael Vorburger ⛑️
2019-12-12 21:39:45 +00:00
parent 0da4cdd412
commit 030d9c8bd8
@@ -18,12 +18,13 @@
*/ */
package org.apache.fineract.infrastructure.jobs.domain; package org.apache.fineract.infrastructure.jobs.domain;
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; import java.util.Objects;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import java.util.Objects;
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
@Entity @Entity
@Table(name = "job_parameters") @Table(name = "job_parameters")
@@ -78,9 +79,9 @@ public class JobParameter extends AbstractPersistableCustom<Long> {
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!obj.getClass().equals(getClass())) return false; if (!obj.getClass().equals(getClass())) return false;
JobParameter jobParameter = (JobParameter) obj; JobParameter jobParameter = (JobParameter) obj;
return jobParameter.getJobId().equals(this.getJobId()) return Objects.equals(jobParameter.getJobId(), this.getJobId())
&& jobParameter.getParameterName().equals(this.getParameterName()) && Objects.equals(jobParameter.getParameterName(), this.getParameterName())
&& jobParameter.getParameterValue().equals(this.getParameterValue()); && Objects.equals(jobParameter.getParameterValue(), this.getParameterValue());
} }
@Override @Override