[fineract] branch develop updated: fix potential NPE in JobParameter.equals() (FINERACT-428)

[aw...@apache.org]

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

awasum pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 030d9c8  fix potential NPE in JobParameter.equals() (FINERACT-428)
     new f739f91  Merge pull request #672 from vorburger/fix-equals-NPE
030d9c8 is described below

commit 030d9c8bd8808f29f928e6018c7655474c13fc8f
Author: Michael Vorburger ⛑️ <mi...@vorburger.ch>
AuthorDate: Thu Dec 12 21:39:45 2019 +0000

    fix potential NPE in JobParameter.equals() (FINERACT-428)
---
 .../fineract/infrastructure/jobs/domain/JobParameter.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java
index 06fafb7..bf573e9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/domain/JobParameter.java
@@ -18,12 +18,13 @@
  */
 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.Entity;
 import javax.persistence.Table;
-import java.util.Objects;
+
+import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 
 @Entity
 @Table(name = "job_parameters")
@@ -78,9 +79,9 @@ public class JobParameter extends AbstractPersistableCustom<Long> {
     public boolean equals(Object obj) {
         if (!obj.getClass().equals(getClass())) return false;
         JobParameter jobParameter = (JobParameter) obj;
-        return jobParameter.getJobId().equals(this.getJobId())
-                && jobParameter.getParameterName().equals(this.getParameterName())
-                && jobParameter.getParameterValue().equals(this.getParameterValue());
+        return Objects.equals(jobParameter.getJobId(), this.getJobId())
+                && Objects.equals(jobParameter.getParameterName(), this.getParameterName())
+                && Objects.equals(jobParameter.getParameterValue(), this.getParameterValue());
     }
 
     @Override