From bfbd597d4115d5cf94fb760cda72d3abd1f225ba Mon Sep 17 00:00:00 2001 From: anushadasari Date: Wed, 20 Nov 2019 16:11:53 +0530 Subject: 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 --- .../src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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; - } } // ******************************************************************* -- cgit 1.2.3-korg