diff options
| author |   r.bogacki <r.bogacki@samsung.com> | 2019-06-17 11:51:42 +0200 |
|---|---|---|
| committer | r.bogacki <r.bogacki@samsung.com> | 2019-06-18 11:38:57 +0200 |
| commit | 095c81fe69ca0c54cd7923888fa9bf4f7924b369 (patch) | |
| tree | 57f399ed10b0a4ab63dd15bf893f027e14f4a686 /adapters/mso-openstack-adapters | |
| parent | 984f8da49f06c1563b4496572c54147014aa94bb (diff) | |
Fixed critical Sonar bugs
Fixed critical bugs according to the Sonar analysis.
-Fixed possible NPE.
-Fixed wrong comparison.
-Removed unused variables.
Issue-ID: SO-2025
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
Change-Id: I5e2e5413c8421eb7ed1db21de6d888a50e1db689
Diffstat (limited to 'adapters/mso-openstack-adapters')
| -rw-r--r-- | adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java index 8511f3cb49..a141f59153 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java @@ -812,6 +812,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter { logger.trace("Found vfModuleCust entry {}", vfmc.toString()); } if (vf.getIsBase()) { + isBaseRequest = true; logger.debug("This is a BASE VF request!"); } else { logger.debug("This is *not* a BASE VF request!"); @@ -938,8 +939,9 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter { if (heatTemplate == null) { String error = "UpdateVF: No Heat Template ID defined in catalog database for " + vfModuleType - + ", modelCustomizationUuid=" + mcu + ", vfModuleUuid=" + vf.getModelUUID() - + ", vnfResourceModelUuid=" + vnfResource.getModelUUID() + ", reqType=" + requestTypeString; + + ", modelCustomizationUuid=" + mcu + ", vfModuleUuid=" + + (vf != null ? vf.getModelUUID() : "null") + ", vnfResourceModelUuid=" + + vnfResource.getModelUUID() + ", reqType=" + requestTypeString; logger.error(LoggingAnchor.SIX, MessageEnum.RA_VNF_UNKNOWN_PARAM.toString(), "Heat Template " + "ID", vfModuleType, OPENSTACK, ErrorCode.DataError.getValue(), error); logger.debug(error); @@ -954,8 +956,9 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter { } else { if (heatEnvironment == null) { String error = "Update VNF: undefined Heat Environment. VF=" + vfModuleType - + ", modelCustomizationUuid=" + mcu + ", vfModuleUuid=" + vf.getModelUUID() - + ", vnfResourceModelUuid=" + vnfResource.getModelUUID() + ", reqType=" + requestTypeString; + + ", modelCustomizationUuid=" + mcu + ", vfModuleUuid=" + + (vf != null ? vf.getModelUUID() : "null") + ", vnfResourceModelUuid=" + + vnfResource.getModelUUID() + ", reqType=" + requestTypeString; logger.error(LoggingAnchor.FIVE, MessageEnum.RA_VNF_UNKNOWN_PARAM.toString(), "Heat " + "Environment ID", OPENSTACK, ErrorCode.DataError.getValue(), error); logger.debug(error); |