Fix potential errors in ASDCController

[so.git] / asdc-controller / src / main / java / org / openecomp / mso / asdc / client / ASDCController.java

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
index 6a75229..867efd5 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
@@ -29,20 +29,20 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import org.openecomp.sdc.api.IDistributionClient;\r
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;\r
-import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage;\r
-import org.openecomp.sdc.api.consumer.INotificationCallback;\r
-import org.openecomp.sdc.api.consumer.IStatusCallback;\r
-import org.openecomp.sdc.api.notification.IArtifactInfo;\r
-import org.openecomp.sdc.api.notification.INotificationData;\r
-import org.openecomp.sdc.api.notification.IResourceInstance;\r
-import org.openecomp.sdc.api.notification.IStatusData;\r
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;\r
-import org.openecomp.sdc.api.results.IDistributionClientResult;\r
-import org.openecomp.sdc.impl.DistributionClientFactory;\r
-import org.openecomp.sdc.utils.DistributionActionResultEnum;\r
-import org.openecomp.sdc.utils.DistributionStatusEnum;\r
+import org.onap.sdc.api.IDistributionClient;\r
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;\r
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;\r
+import org.onap.sdc.api.consumer.INotificationCallback;\r
+import org.onap.sdc.api.consumer.IStatusCallback;\r
+import org.onap.sdc.api.notification.IArtifactInfo;\r
+import org.onap.sdc.api.notification.INotificationData;\r
+import org.onap.sdc.api.notification.IResourceInstance;\r
+import org.onap.sdc.api.notification.IStatusData;\r
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;\r
+import org.onap.sdc.api.results.IDistributionClientResult;\r
+import org.onap.sdc.impl.DistributionClientFactory;\r
+import org.onap.sdc.utils.DistributionActionResultEnum;\r
+import org.onap.sdc.utils.DistributionStatusEnum;\r
 import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;\r
 import org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException;\r
 import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;\r
@@ -492,17 +492,17 @@ public class ASDCController {
        try {\r
                LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***WRITE FILE ARTIFACT NAME", "ASDC", artifact.getArtifactName());\r
 \r
-               FileOutputStream outFile = new FileOutputStream(System.getProperty("mso.config.path") + "/ASDC" + "/" + artifact.getArtifactName());\r
-               outFile.write(payloadBytes, 0, payloadBytes.length);\r
-               outFile.close();\r
-               } catch (Exception e) { \r
-                       LOGGER.debug("Exception :",e);\r
-                LOGGER.error(MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,\r
-                                       artifact.getArtifactName (),\r
-                                       artifact.getArtifactURL (),\r
-                                       artifact.getArtifactUUID (),\r
-                                       resultArtifact.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC write to file failed"); \r
-            } \r
+               try (FileOutputStream outFile = new FileOutputStream(System.getProperty("mso.config.path") + "/ASDC" + "/" + artifact.getArtifactName())) {\r
+                outFile.write(payloadBytes, 0, payloadBytes.length);\r
+               }\r
+        } catch (Exception e) {\r
+            LOGGER.debug("Exception :",e);\r
+            LOGGER.error(MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,\r
+                    artifact.getArtifactName (),\r
+                    artifact.getArtifactURL (),\r
+                    artifact.getArtifactUUID (),\r
+                    resultArtifact.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC write to file failed");\r
+        }\r
        \r
     }\r
 \r