Merge "Fix potential errors in ASDCController"

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 c452089..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
@@ -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