From: shashikanth <shashikanth.vh@huawei.com>
Date: Mon, 25 Sep 2017 09:32:23 +0000 (+0530)
Subject: Deleted redundant code
X-Git-Tag: v1.1.0~288
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=18953088cfedfb0889fcef3746a12d37468f1811;p=so.git

Deleted redundant code

Remove this return statement from this finally block
https://sonar.onap.org/component_issues?id=org.openecomp.so%3Aso#resolved=false|severities=BLOCKER

Issue-Id:SO-118
Change-Id: I6933ec089e6030d5fd5495b37f4d785b0935341b
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
---

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncVlOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncVlOperationTask.java
index 8b26d01432..212711e5f3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncVlOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncVlOperationTask.java
@@ -89,23 +89,21 @@ public abstract class AbstractSdncVlOperationTask extends BaseTask {
         } catch (Exception e) {
             System.out.println(e);
             logger.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
-        } finally {
-            return defaultValue;
         }
+        return defaultValue;
     }
 
     private Integer getInteger(DelegateExecution execution, String name, Integer defaultValue) {
         Integer vlaue = (Integer) execution.getVariable(name);
         try {
-            if (vlaue != null && vlaue instanceof Integer) {
+            if (vlaue != null) {
                 return vlaue;
             }
         } catch (Exception e) {
             System.out.println(e);
             logger.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
-        } finally {
-            return defaultValue;
         }
+        return defaultValue;
     }
 
     public String getProcessKey(DelegateExecution execution) {