Merge this if statement with the enclosing one

Merging collapsible if statements increases the code's readability.

Issue-ID: OPTFRA-634
Change-Id: Ie21aeba053ced68ad1dbe25b39cf891219ff669f
Signed-off-by: anushadasari <danush10@in.ibm.com>

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java
index ccbc430..f663240 100644 (file)
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java
@@ -140,10 +140,8 @@ public class DispatchJob {
         // Validate ticket is still active with tm\r
         //\r
         // TODO\r
-        if (cmSchedule.getTmChangeId() != null && !cmSchedule.getTmChangeId().equals("")) {\r
-            if (!isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {\r
+        if (cmSchedule.getTmChangeId() != null && !cmSchedule.getTmChangeId().equals("") && !isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {\r
                 return false;\r
-            }\r
         }\r
 \r
         // *******************************************************************\r