Sync Integ to Master

[sdc.git] / asdctool / src / main / java / org / openecomp / sdc / asdctool / impl / ProductLogic.java

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
index 7ed8b17..502ddd1 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java
@@ -44,23 +44,18 @@ public class ProductLogic {
        public boolean deleteAllProducts(String titanFile, String beHost, String bePort, String adminUser) {
                log.debug("retrieving all products from graph");
                RestUtils restUtils = null;
-               try {
-                       List<String> productList = getAllProducts(titanFile);
-                       restUtils = new RestUtils();
-                       if (productList != null) {
-                               for (String productUid : productList) {
-                                       Integer status = restUtils.deleteProduct(productUid, beHost, bePort, adminUser);
-                               }
-                               return true;
-                       } else {
-                               log.error("failed to get products from graph");
-                               return false;
-                       }
-               } finally {
-                       if (restUtils != null) {
-                               restUtils.closeClient();
-                       }
-               }
+        List<String> productList = getAllProducts(titanFile);
+        restUtils = new RestUtils();
+        if (productList != null) {
+            for (String productUid : productList) {
+                restUtils.deleteProduct(productUid, beHost, bePort, adminUser);
+            }
+            return true;
+        }
+        else {
+            log.error("failed to get products from graph");
+            return false;
+        }
        }
 
        private List<String> getAllProducts(String titanFile) {