From: anushadasari <danush10@in.ibm.com>
Date: Wed, 20 Nov 2019 10:41:53 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.2.0~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bfbd597d4115d5cf94fb760cda72d3abd1f225ba;p=optf%2Fcmso.git

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
--- 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
         //
         // TODO
-        if (cmSchedule.getTmChangeId() != null && !cmSchedule.getTmChangeId().equals("")) {
-            if (!isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {
+        if (cmSchedule.getTmChangeId() != null && !cmSchedule.getTmChangeId().equals("") && !isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {
                 return false;
-            }
         }
 
         // *******************************************************************