aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranushadasari <danush10@in.ibm.com>2019-11-20 16:11:53 +0530
committeranushadasari <danush10@in.ibm.com>2019-11-20 16:12:08 +0530
commitbfbd597d4115d5cf94fb760cda72d3abd1f225ba (patch)
treee8b1f97878750b534417b0b62a22542ea6de8467
parent614f8f9a33ade5b523003c9f5aa7299f11fcfc19 (diff)
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>
-rw-r--r--cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java4
1 files changed, 1 insertions, 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;
- }
}
// *******************************************************************